aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ffmpeg: Fix VDPAU decoding for some H264 samples.Carl Eugen Hoyos2011-07-061-1/+2
| | | | (cherry picked from commit a4ab70f92e4d8705434a2fee42a2b69a8bfa6bb1)
* ogg: fix double free when finding length of small chained oggs.Ronald S. Bultje2011-07-061-1/+2
| | | | | | | | | ogg_save() copies streams[], but doesn't keep track of free()'ed struct members. Thus, if in between a call to ogg_save() and ogg_restore(), streams[].private was free()'ed, this would result in a double free -> crash, which happened when e.g. playing small chained ogg fragments. (cherry picked from commit 9ed6cbc3ee2ae3e7472fb25192a7e36fd7b15533)
* Fix possible double free when encoding using xvid.Carl Eugen Hoyos2011-07-061-0/+1
| | | | (cherry picked from commit 315f0e3fd8dcbd1362276b7407dad2e97cccc4b7)
* Revert needless API change in 05e84c95.Reimar Döffinger2011-06-221-1/+2
| | | | | | | | | When providing a custom AVIOContex for a AVFMT_NOFILE format only print a warning instead of erroring out. This allows the code to work with older MPlayer versions that just always set pb out of laziness. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* Merge branch 'master' into oldabiMichael Niedermayer2011-06-214-7/+9
|\ | | | | | | | | | | | | | | | | * master: ffplay: do not init SDL audio if -an is specified. Fix zero-length gnu_printf format string warning. A cmp instruction with two constants is invalid, thus "g" constraint is not correct but must be "rm" instead. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffplay: do not init SDL audio if -an is specified.n0.8Clément Bœsch2011-06-211-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * Fix zero-length gnu_printf format string warning.Clément Bœsch2011-06-213-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * A cmp instruction with two constants is invalid, thus "g" constraintReimar Döffinger2011-06-211-4/+4
| | | | | | | | | | | | | | is not correct but must be "rm" instead. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge branch 'master' into oldabiMichael Niedermayer2011-06-2110-21/+122
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: release_notes: document not fully understood mingw-sdl issue release_notes: some updates presets: forgotten libvpx presets release_notes: fix version release_notes: mention more codecs Signed-off-by: Michael Niedermayer <michaelni@gmx.at> release_notes: there will be 2 releases each for one ABI/API. release_notes: suggest git log instead of the poorly maintained APIChanges release_notes: we do support releases build system: disable memalign on haiku, its not reliable there. ffprobe: remove duplicate avformat_alloc_context() Fix segmentation fault in ffprobe wma: fix infinite loop Fix H.264 4:4:4 lossless decoding. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * release_notes: document not fully understood mingw-sdl issueMichael Niedermayer2011-06-211-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * release_notes: some updatesMichael Niedermayer2011-06-211-8/+15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * presets: forgotten libvpx presetsMichael Niedermayer2011-06-215-0/+84
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * release_notes: fix versionMichael Niedermayer2011-06-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * release_notes: mention more codecsMichael Niedermayer2011-06-211-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * release_notes: there will be 2 releases each for one ABI/API.Michael Niedermayer2011-06-211-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * release_notes: suggest git log instead of the poorly maintained APIChangesMichael Niedermayer2011-06-211-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * release_notes: we do support releasesMichael Niedermayer2011-06-211-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * build system: disable memalign on haiku, its not reliable there.Michael Niedermayer2011-06-211-0/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * ffprobe: remove duplicate avformat_alloc_context()Michael Niedermayer2011-06-211-2/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * Fix segmentation fault in ffprobeGavin Kinsey2011-06-211-0/+1
| |
| * wma: fix infinite loopMichael Niedermayer2011-06-211-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * Fix H.264 4:4:4 lossless decoding.Jason Garrett-Glaser2011-06-211-1/+1
| | | | | | | | The coefficient test for i16x16 add_pixels4 assumed luma plane.
* | swscale: undo version upgrade that git merged in and that i missedMichael Niedermayer2011-06-211-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: revert ABI breaking long->int chnage that touch public ABIMichael Niedermayer2011-06-212-8/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge branch 'master' into oldabiMichael Niedermayer2011-06-21107-929/+2290
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (109 commits) libx264: fix open gop default. Please use -x264opts to force open gop This fixes Ticket268 avfilter picture pool: double free hotfix mpegaudio_parser: be less picky on the start position ppc32: Fix movrel Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). x86: cabac: fix register constraints for 32-bit mode cabac: move x86 asm to libavcodec/x86/cabac.h x86: h264: cast pointers to intptr_t rather than int x86: h264: remove hardcoded edi in decode_significance_8x8_x86() x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86() x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86() x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86() x86: cabac: change 'a' constraint to 'r' in get_cabac_inline() x86: cabac: remove hardcoded esi in get_cabac_inline() x86: cabac: remove hardcoded edx in get_cabac_inline() x86: cabac: remove unused macro parameter x86: cabac: remove hardcoded ebx in inline asm x86: cabac: remove hardcoded struct offsets from inline asm cabac: remove inline asm under #if 0 cabac: remove BRANCHLESS_CABAC_DECODER switch ... Conflicts: cmdutils.c ffserver.c libavfilter/avfilter.h libavformat/avformat.h libavformat/utils.c libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx264: fix open gop default.Michael Niedermayer2011-06-211-1/+1
| | | | | | | | | | | | | | Please use -x264opts to force open gop This fixes Ticket268 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * avfilter picture pool: double free hotfixMichael Niedermayer2011-06-211-2/+3
| | | | | | | | | | | | This fix introduces a small memleak Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-2121-435/+288
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (28 commits) Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). x86: cabac: fix register constraints for 32-bit mode cabac: move x86 asm to libavcodec/x86/cabac.h x86: h264: cast pointers to intptr_t rather than int x86: h264: remove hardcoded edi in decode_significance_8x8_x86() x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86() x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86() x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86() x86: cabac: change 'a' constraint to 'r' in get_cabac_inline() x86: cabac: remove hardcoded esi in get_cabac_inline() x86: cabac: remove hardcoded edx in get_cabac_inline() x86: cabac: remove unused macro parameter x86: cabac: remove hardcoded ebx in inline asm x86: cabac: remove hardcoded struct offsets from inline asm cabac: remove inline asm under #if 0 cabac: remove BRANCHLESS_CABAC_DECODER switch cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED document libswscale bump error_resilience: skip last-MV predictor step if MVs are not available. error_resilience: actually add counter when adding a MV predictor. ... Conflicts: Changelog libavcodec/error_resilience.c libavfilter/defaults.c libavfilter/vf_drawtext.c libswscale/swscale.h tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| | * Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().Justin Ruggles2011-06-2012-16/+16
| | | | | | | | | | | | av_get_bits_per_sample_fmt() is deprecated.
| | * x86: cabac: fix register constraints for 32-bit modeMans Rullgard2011-06-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Some operands need to be accessed in byte mode, which restricts the available registers in 32-bit mode. Using the 'q' constraint selects a suitable register. Signed-off-by: Mans Rullgard <mans@mansr.com>
| | * cabac: move x86 asm to libavcodec/x86/cabac.hMans Rullgard2011-06-203-132/+173
| | | | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| | * x86: h264: cast pointers to intptr_t rather than intMans Rullgard2011-06-201-3/+3
| | | | | | | | | | | | | | | | | | | | | Only the low-order bits are used here so the type is not important, but this avoids a compiler warning. Signed-off-by: Mans Rullgard <mans@mansr.com>
| | * x86: h264: remove hardcoded edi in decode_significance_8x8_x86()Mans Rullgard2011-06-201-25/+26
| | | | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| | * x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86()Mans Rullgard2011-06-201-31/+34
| | | | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| | * x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86()Mans Rullgard2011-06-201-35/+37
| | | | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| | * x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86()Mans Rullgard2011-06-201-26/+26
| | | | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| | * x86: cabac: change 'a' constraint to 'r' in get_cabac_inline()Mans Rullgard2011-06-201-1/+1
| | | | | | | | | | | | | | | | | | Nothing requires this value in %eax. Signed-off-by: Mans Rullgard <mans@mansr.com>
| | * x86: cabac: remove hardcoded esi in get_cabac_inline()Mans Rullgard2011-06-201-8/+8
| | | | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| | * x86: cabac: remove hardcoded edx in get_cabac_inline()Mans Rullgard2011-06-201-8/+8
| | | | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| | * x86: cabac: remove unused macro parameterMans Rullgard2011-06-201-3/+3
| | | | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| | * x86: cabac: remove hardcoded ebx in inline asmMans Rullgard2011-06-202-60/+63
| | | | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| | * x86: cabac: remove hardcoded struct offsets from inline asmMans Rullgard2011-06-202-40/+41
| | | | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| | * cabac: remove inline asm under #if 0Mans Rullgard2011-06-201-31/+0
| | | | | | | | | | | | | | | | | | A comment says it's not faster than the C code. Signed-off-by: Mans Rullgard <mans@mansr.com>
| | * cabac: remove BRANCHLESS_CABAC_DECODER switchMans Rullgard2011-06-202-113/+1
| | | | | | | | | | | | | | | | | | The code does not compile without this set. Signed-off-by: Mans Rullgard <mans@mansr.com>
| | * cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLEDMans Rullgard2011-06-201-62/+0
| | | | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| | * document libswscale bumpReinhard Tartler2011-06-202-1/+2
| | |
| | * error_resilience: skip last-MV predictor step if MVs are not available.Ronald Bultje2011-06-201-0/+4
| | | | | | | | | | | | Fixes crashes when playing broken MPEG2-TS streams.
| | * error_resilience: actually add counter when adding a MV predictor.Ronald Bultje2011-06-203-4/+5
| | | | | | | | | | | | Without, the predictor isn't actually used.
| | * qdm2: Fix alignment of local array.Michael Niedermayer2011-06-201-3/+3
| | | | | | | | | | | | | | | | | | | | | Fixes ticket270 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| | * ocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAXStefano Sabatini2011-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | Fix compilatin after removal of FF_INTERNAL_MEM_TYPE_MAX_VALUE. Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it> Signed-off-by: Anton Khirnov <anton@khirnov.net>