aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ff_gen_search: fix infinite loopMichael Niedermayer2013-06-181-1/+1
| | | | | | | Fixes Ticket2639 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f8ca8138f01d0a7d96d4e1ea65fecd1197f96206)
* ff_gen_search: fix limitMichael Niedermayer2013-06-181-1/+3
| | | | | | | The limit value could become slightly wrong in the last iteration Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b3dd50cd0dbbda08610b75384128f5f47f5199d9)
* ff_gen_search: make step 64 bit to prevent hypothetical integer overflowMichael Niedermayer2013-06-181-1/+1
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9d73e302537144877ca9d5b648b21aca28b78f4f)
* swresample/x86/audio_convert: add emms to CONVMichael Niedermayer2013-06-181-0/+5
| | | | | | | Fixes ticket #1874 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ca2818b88155029bb6f989ee522e7f8e9e9f5927)
* vaapi: return early from ff_vaapi_render_picture() without pictureJanne Grunau2013-06-181-0/+3
| | | | | | | | | | | Fixes an assertion when called on uninitialized frame. Spotted after seeking in vlc. Fixes ticket #2461. Tested-by: Timo Reviewed-by: Joakim Plate Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at> (cherry picked from commit 2ee380aefbb92c89e8e9c7aa5846aa404919ec7c)
* alacenc: Fix missing sign_extend()Michael Niedermayer2013-06-131-1/+1
| | | | | | | Fixes ticket #2497 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8aea2f05dc56f7e7d60767dd27ba8e846a05e8ae)
* avcodec/utils: Fix encoder allocation sizeMichael Niedermayer2013-06-111-1/+1
| | | | | | | | | | Fixes Ticket2645 Found-by: Darrell Walisser Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 175e916fa20b7887bdb29809817985e481ae0888) Conflicts: libavcodec/utils.c
* AAC encoder: Fix rate control on twoloop.Claudio Freire2013-06-021-1/+1
| | | | | | | | | | | Fixes a case where multichannel bitrate isn't accurately targetted by psy model alone, never achieving the target bitrate. Now fixed. Fixes ticket #2625. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* mpegvideo: implement ff_put_h264_chroma_mc1 & ff_avg_h264_chroma_mc2Michael Niedermayer2013-06-024-5/+35
| | | | | | | | | | | These are needed for lowres 3 Fixes Ticket2538 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c2625c26c5e58edfa39360b51125f1ddd593e4db) Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* h264_cavlc: fix reading skip runMichael Niedermayer2013-05-301-1/+1
| | | | | | | Fixes Ticket2606 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 826b3a75cd295c03720e00d3de83e1abcbedd4b9)
* avienc: Disallow the first frame to be skipedMichael Niedermayer2013-05-271-1/+1
| | | | | | | Fixes Ticket2386 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cc0db8cf3042186d8355dcf10be67071cfbbcc5d)
* smacker: remove av_clip_int16()Michael Niedermayer2013-05-201-2/+2
| | | | | | | Fixes Ticket2425 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2211c76287e073a9e176fde7dbb9a63ceb2af8d1)
* ffmpeg: free threads on error conditions.Michael Niedermayer2013-05-171-0/+5
| | | | | | | Fixes Ticket2562 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1a36c756d8959207d3386f03e11c15216abc50b7)
* configure: Autodetect VA-APICarl Eugen Hoyos2013-05-171-10/+6
| | | | | | This fixes a regression (reproducible since 1.2) and restores the behaviour of 0.6, 0.7, 0.8, 0.9, 0.10, 0.11, 1.0 and 1.1. (cherry picked from commit 17989dcf540c13a7122663f64c09dc830ffc3a41)
* avidec: dont randomly skip packets for offseting the indexMichael Niedermayer2013-05-171-2/+2
| | | | | | | Fixes Ticket2490 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6c593f1b671b7725b8c36f92f7c0a23ccf8e7628)
* Do not read strd chunk in avi files as H264 extradata.Carl Eugen Hoyos2013-05-131-1/+3
| | | | | Fixes ticket #2561. (cherry picked from commit 231b3317184790b6be4b4619d96fd328f13aeabb)
* Fix configure --help output for some autodetected features.Carl Eugen Hoyos2013-05-101-5/+5
| | | | (cherry picked from commit 0f05b72f19c0a07cf48c912d2a71c3fb5f7bc325)
* exr: silence warning "libavcodec/exr.c:351:9: warning: variable ret set but ↵n1.2.1Michael Niedermayer2013-05-091-1/+2
| | | | | | | | | not used" Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7ff3bfd584a732e6b8b601e13d171a0f0200c151) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* update for 1.2.1Michael Niedermayer2013-05-093-3/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* gifdec: reset previous Graphic Control Extension disposal typeMichael Niedermayer2013-05-091-0/+1
| | | | | | | | | | This fixes out of array accesses. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d23b8462b5a4a9da78ed45c4a7a3b35d538df909) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/cdgraphics: check buffer size before useMichael Niedermayer2013-05-091-1/+3
| | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ad002e1a13a8df934bd6cb2c84175a4780ab8942) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* sanm: Check dimensions before useMichael Niedermayer2013-05-091-0/+5
| | | | | | | | | | Fixes integer overflow and out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9dd04f6d8cdd1c10c28b2cb4252c1a41df581915) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* cmdutils: avtool -> fftoolClément Bœsch2013-05-091-3/+3
| | | | | | (cherry picked from commit 7d8ad6c1fa11ec548fc63427656989e0e7c6af8b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/intfloat_readwrite: include common.h for isinf()Michael Niedermayer2013-05-091-0/+1
| | | | | | | | | | | Solution based on rational.c, which uses isinf() too This should fix compilation with msvc Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c25224737cba4079602c447c344cb54b81430ce4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/intfloat_readwrite: avoid comparission with INFINITY, use isinf()Michael Niedermayer2013-05-091-1/+1
| | | | | | | | | Should fix pgc warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit cc6f848dba89a6dc89b840cc2e1942cc3007c2a3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avutil/log: Fix context pointer used for get_category()Michael Niedermayer2013-05-091-1/+1
| | | | | | | | | | Fixes calling a random pointer Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7edb984dd051b6919d7d8471c70499273f31b0fa) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* vmdav: Try to fix unpack_rle()Michael Niedermayer2013-05-091-3/+3
| | | | | | | | | | | | | | | | | | | | This fixes out of array accesses The code prior to this commit could not have worked, thus obviously was untested. I was also not able to find a valid sample that uses this code. This fix is thus only based on the description of the format If someone has a sample that uses unpack_rle(), please mail me. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c1f2c4c3b49277d65b71ccdd3b6b2878f1b593eb) Conflicts: libavcodec/vmdav.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mmvideo/mm_decode_intra: check horizontal coordinate tooMichael Niedermayer2013-05-091-0/+3
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ae2132ac90f02330b0988e6e26ee0d53e41cd196) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mmvideo/mm_decode_inter: check horizontal coordinate tooMichael Niedermayer2013-05-091-0/+2
| | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8d3c99e825317b7efda5fd12e69896b47c700303) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mjpegdec: fix overlapping memcpy with upscale_vMichael Niedermayer2013-05-091-3/+7
| | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b39fd7d63648442c20671c3e4b357268ec5c49f2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* src_movie: fix scanf stringMichael Niedermayer2013-05-091-3/+3
| | | | | | | | | Fixes out of array accesses Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit adaa7743f5fdca0c0aca0b7ffdebf61c7d868571) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* xbmdec: fix off by one error in scanf()Michael Niedermayer2013-05-091-1/+1
| | | | | | Fixes out of array access Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Fix heap-buffer-overflow in matroska_parse_blockDale Curtis2013-05-091-3/+4
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 81e85bc95cb1e4f8cc7b1ba71ec027c8791b55d1) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* dpxenc: fix data offsetArnoB2013-05-092-3/+4
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 361319d0f49475bc14c744194870f9bab78a8a83) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* rmdec: flush audio packet on seekingMichael Niedermayer2013-05-091-0/+13
| | | | | | | | | Fixes Ticket1605 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 519ebb5ee5b89b8ecc80b4a4540fcbeb65cda172) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mpegvideo: Fix edge emu with lowresMichael Niedermayer2013-05-091-1/+1
| | | | | | | | Fixes a few green artifacts at the top Fixes rest of Ticket 2535 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c67bca2b5a94efb8fb3c2ba2c7d9b1b413468838)
* avcodec/mpegvideo: Fix block height for lowres 3 interlaced blocksMichael Niedermayer2013-05-091-3/+4
| | | | | | | | Fixes green trash Fixes part of Ticket2535 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bca50e5cd52240d885afeb3edb0fa2c74b352add)
* matroska: set "done" only during resync fail.Reimar Döffinger2013-05-091-1/+0
| | | | | | | Fixes playback of test7.mkv validation test file. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> (cherry picked from commit 762d4335aec2e5299a06bfbce15d21336af19464)
* lavfi/subtitles: zero-init AVSubtitle.Clément Bœsch2013-05-091-1/+1
| | | | | | | | This avoids invalid free when the stream id doesn't match the packet stream index. Ticket #2501 (cherry picked from commit 035a3792c223d3b2bba79f38049bd6363b2d470d)
* Fix type of shared flac table ff_flac_blocksize_table[].Carl Eugen Hoyos2013-05-052-2/+2
| | | | | Fixes ticket #2533. (cherry picked from commit a07ac1f7888fd08e42da2bed0421e74f1cfac177)
* vaapi: fix argument for ff_vaapi_common_end_frame callJanne Grunau2013-04-131-1/+1
| | | | (cherry picked from commit b066d90211072c7532e17c0c54d8475f10fc97ad)
* lavc: fix recoded subtitles end.Nicolas George2013-04-072-2/+2
| | | | | | | | | | | Text subtitles packets are not 0-terminated (and if they are, it is handled by the recoding process since 0 is a valid Unicode code point). The terminating 0 would overwrite the last payload octet. OTOH, packets must be 0-padded. Fix a problem reported in trac ticket #2431.
* Skip padding in an id3 tag in aiff files.Carl Eugen Hoyos2013-04-031-1/+4
| | | | | | | Fixes ticket #2430. Reviewed-by: Matthieu Bouron (cherry picked from commit db2d3a90825025b2f5da85792e1df33280c61391)
* smacker: fix off by one errorPaul B Mahol2013-04-031-1/+1
| | | | | | | | | Regression since a93b572ae4f517ce0c35cf085167c318e9215908. Fixes #2426. Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit e3cc92a623a6ece42816c7a692c8815688a99ab0)
* Write broken aac frames to mov files instead of skipping them.Carl Eugen Hoyos2013-04-021-7/+8
| | | | | | | Fixes decoding with picky media players. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b448c0a68d0cc7dfef736267dfdaed0e213c020b)
* Only test the first frame for missing aac_adtstoasc bistream filter.Carl Eugen Hoyos2013-03-272-0/+6
| | | | | | | | Many players ignore broken aac frames, so don't abort mov or flv muxing when encountering one, just print a warning instead. Fixes ticket #2380. (cherry picked from commit 1741fece7073f51efdd837a4f307ea2cdf3d1cfb)
* configure: Enable hwaccels without external dependencies by default.Diego Biurrun2013-03-221-0/+3
| | | | | Fixes ticket #2368. (cherry picked from commit 2e2ec667416d8ed345491ac360fccc94e7a4772f)
* Do not (re-)set libx264 parameter b_tff if interlaced encoding was not ↵Carl Eugen Hoyos2013-03-181-1/+1
| | | | | | | | | requested. Reconfiguring can break x264 lossless encoding. Fixes ticket #2165. (cherry picked from commit 75c7e4583f4fd727d236a12763a265502fe00988)
* mem: Fix usage of memalign() on DJGPP.n1.2Fabrizio Gennari2013-03-141-0/+4
| | | | | | | | Credits to Khusraw of bttr-software.de forum. Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at> (cherry picked from commit 91b747ac78218805a79435f50587f87167569dad) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* release_notes: updateMichael Niedermayer2013-03-141-7/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>