virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
32,354 Commits 37 Branches 400 Tags 460 MiB
be7eed72c8
Commit Graph

48 Commits

Author SHA1 Message Date
Michael Niedermayer
a39bd458a0 mem: Trying to workaround posix_memalign() bug on OSX 
This patch is based on a patch by John Stebbins

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-07 03:17:42 +02:00
Stefano Sabatini
6b4c0be558 mem: define the MAX_MALLOC_SIZE constant and use it in place of INT_MAX 
This makes re-dimensionating the constant simpler, since now it is
defined only in one place.
 2011-05-24 00:41:14 +02:00
Ivan Kalvachev
518cdff81f Fix posix_memalign() usage when libavutil is compiled outside FFmpeg. 
To use posix_memalign() "#define _XOPEN_SOURCE 600" have to be defined.
FFmpeg configure defines it from the command line through config.mak,
but when libavutil is used outside of FFmpeg the define is missing.

Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-12 17:35:30 +02:00
Michael Niedermayer
08675bb399 mem: Choose alignment at compile time depending on AVX enabledness. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-10 03:15:42 +02:00
Michael Niedermayer
c8981edd90 Only add 1 byte to av_malloc(0) when it actually returned NULL 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-07 16:21:54 +02:00
Michael Niedermayer
91ff05f6ac Make av_realloc(0) behave like our av_malloc(0) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-07 16:21:47 +02:00
Michael Niedermayer
ffb5a0d533 Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45' 
* commit '85770f2a2651497861ed938efcd0df3696ff5e45':
  AVOptions: make default_val a union, as proposed in AVOption2.
  Move ff_dynarray_add to lavu and make it public.
  lavf: remove duplicate assignment in avformat_alloc_context.
  lavf: use designated initializers for AVClasses.
  options: simplify av_find_opt by using av_next_option.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-01 00:26:05 +02:00
Anton Khirnov
35ceaa7376 Move ff_dynarray_add to lavu and make it public. 2011-04-29 17:34:56 +02:00
Michael Niedermayer
5a36783bc4 Fix all malloc(0) issues 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-29 02:17:38 +02:00
Michael Niedermayer
d7e5aebae7 Merge remote branch 'qatar/master' 
* qatar/master: (23 commits)
  ac3enc: correct the flipped sign in the ac3_fixed encoder
  Eliminate pointless '#if 1' statements without matching '#else'.
  Add AVX FFT implementation.
  Increase alignment of av_malloc() as needed by AVX ASM.
  Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
  documentation: extend documentation for ffmpeg -aspect option
  APIChanges: update commit hashes for recent additions.
  lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
  aac: add headers needed for log2f()
  lavc: remove FF_API_MB_Q cruft
  lavc: remove FF_API_RATE_EMU cruft
  lavc: remove FF_API_HURRY_UP cruft
  pad: make the filter parametric
  vsrc_movie: add key_frame and pict_type.
  vsrc_movie: fix leak in request_frame()
  lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
  vsrc_buffer: add sample_aspect_ratio fields to arguments.
  lavfi: add fieldorder filter
  scale: make the filter parametric
  ...

Conflicts:
	Changelog
	doc/filters.texi
	ffmpeg.c
	libavcodec/ac3dec.h
	libavcodec/dsputil.c
	libavfilter/avfilter.h
	libavfilter/vf_scale.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-27 03:51:04 +02:00
Vitor Sessak
13dfce3d44 Increase alignment of av_malloc() as needed by AVX ASM. 
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-04-26 18:18:22 +02:00
Michael Niedermayer
efb5fa79f5 Merge remote branch 'qatar/master' 
* qatar/master: (37 commits)
  In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function.
  lavc: remove reference to opt.h from Makefile.
  prefer avio_check() over url_exist()
  avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols
  lavu: remove misc disabled cruft
  lavu: remove FF_API_OLD_IMAGE_NAMES cruft
NOT PULLED  lavu: remove FF_API_OLD_EVAL_NAMES cruft
  lavc: remove misc disabled cruft.
  lavc: remove the FF_API_INOFFICIAL cruft.
  lavc: remove the FF_API_SET_STRING_OLD cruft.
  lavc: remove the FF_API_USE_LPC cruft.
  lavc: remove the FF_API_SUBTITLE_OLD cruft.
  lavc: remove the FF_API_VIDEO_OLD cruft.
  lavc: remove the FF_API_AUDIO_OLD cruft.
  lavc: remove the FF_API_OPT_SHOW cruft.
  lavc: remove the FF_API_MM_FLAGS cruft.
  lavf: remove misc disabled cruft.
  lavf: remove FF_API_INDEX_BUILT cruft
  lavf: remove FF_API_URL_CLASS cruft.
  lavf: remove FF_API_SYMVER cruft
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-20 04:48:23 +02:00
Anton Khirnov
490a022d86 lavu: remove misc disabled cruft 2011-04-19 19:04:28 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Clément Bœsch
0c8eb72ec5 Avoid pointless check before calling free 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit dc75d6dbf2)
 2011-02-04 03:10:10 +01:00
Clément Bœsch
dc75d6dbf2 Avoid pointless check before calling free 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-03 01:36:00 +00:00
Michael Niedermayer
b47541c7a3 Change the argument of memory allocation functions from unsigned int to size_t 
with the next major bump in libavutil.

Originally committed as revision 25871 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-04 04:00:12 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands. 
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 14:45:34 +00:00
Måns Rullgård
4ae406856f Add --malloc-prefix to apply a prefix to malloc, free etc 
This makes it easy to use a replacement allocator instead of the
system default one.

Originally committed as revision 21509 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-28 13:06:31 +00:00
Patrik Kullman
a90de11dba Check return value of posix_memalign and explicitly set pointer to NULL if it 
fails, patch by Patrik Kullman, patrik yes nu.

Originally committed as revision 17495 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-21 20:38:27 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives. 
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 02:00:19 +00:00
Diego Biurrun
89c9ff504b spelling/grammar/consistency review part I 
Originally committed as revision 16840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-28 00:16:05 +00:00
Diego Biurrun
1e60e93355 10l: Add #undefs for system free/malloc/realloc, which must be used here. 
Originally committed as revision 16794 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-25 22:59:05 +00:00
Diego Biurrun
77652a6aaf C files should #include the header files of the same name. 
Originally committed as revision 16792 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-25 22:40:43 +00:00
Diego Biurrun
692c315e3a Do not #include common.h without necessity. 
This eliminates the need to work around common.h overriding certain system
functions which are required in this header.

Originally committed as revision 16776 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-25 17:36:48 +00:00
Diego Biurrun
dfcb6b56f9 Directly #include a bunch of indirectly #included headers. 
Originally committed as revision 16748 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-24 14:55:30 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Ramiro Polla
1f91cdce0b Use posix_memalign() if available. 
Originally committed as revision 16488 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 23:36:34 +00:00
Michael Niedermayer
19757f6169 indent 
Originally committed as revision 13251 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 12:37:52 +00:00
Michael Niedermayer
fdf35f265a make av_strdup(NULL) return NULL 
Originally committed as revision 13250 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-23 12:37:32 +00:00
Michael Niedermayer
ed0d3048c0 Merge declaratio and initialization. 
Originally committed as revision 12677 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-03 19:20:32 +00:00
Michael Niedermayer
11362767b8 Merge declaration and initialization. 
Originally committed as revision 12676 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-03 19:18:14 +00:00
Diego Biurrun
2cab640129 typo fixes 
Originally committed as revision 12428 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-12 23:58:46 +00:00
Diego Biurrun
7ce6892373 misc spelling fixes 
Originally committed as revision 12410 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 18:42:09 +00:00
avcoder
90d30570d8 Avoid void*-arithmetic. 
Patch by mvplayer: ffmpeg gmail com

Originally committed as revision 11932 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-14 08:16:07 +00:00
Panagiotis Issaris
d7f654692a Move unaltered av_freep() comments to the header file. 
Originally committed as revision 8253 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-05 13:51:03 +00:00
Panagiotis Issaris
f690ee715d Move unaltered av_free() comments to the header file. 
Originally committed as revision 8252 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-05 13:50:03 +00:00
Panagiotis Issaris
d6def91a3b Move unaltered av_realloc() comments to the header file. 
Originally committed as revision 8251 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-05 13:46:47 +00:00
Panagiotis Issaris
9a07029916 Move unaltered av_malloc() comments to the header file. 
Originally committed as revision 8250 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-05 13:45:52 +00:00
Diego Biurrun
eafcac6ac8 cosmetics: Fix another common typo, dependAnt --> dependEnt. 
Originally committed as revision 8114 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-24 09:41:43 +00:00
Måns Rullgård
9ddbcae667 rename MEMALIGN_HACK to CONFIG_MEMALIGN_HACK, use common code in configure 
Originally committed as revision 7025 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-14 00:35:21 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Luca Barbato
79e47000c8 move memory functions from avcodec to avutil 
Originally committed as revision 6330 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-25 15:23:40 +00:00
Michael Niedermayer
0a7c36af54 revert aligned realloc() changesm this should be identical to r5784 
Originally committed as revision 6008 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-17 08:18:48 +00:00
Michael Niedermayer
732692d94c trying to fix av_realloc() 
Originally committed as revision 5996 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-13 21:09:00 +00:00
Michael Niedermayer
75c413ae77 align av_realloc() 
Originally committed as revision 5992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-13 00:47:16 +00:00
Luca Abeni
cea8f6f323 Move av_malloc(), av_realloc(), and av_free() from libavcodec to libavutil 
Originally committed as revision 5784 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-19 07:28:58 +00:00