aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* x86: fft: Remove 3DNow! optimizations, they break FATEDiego Biurrun2013-10-304-209/+0
|
* x86: ac3dsp: Drop mmx variant of ac3_max_msb_abs_int16Diego Biurrun2013-10-292-11/+0
| | | | | | | The function accidentally uses mmxext instructions, so it causes sigill on mmx-only CPUs and provides no benefit on CPUs with mmxext available. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* aac: Check init_get_bits return valueLuca Barbato2013-10-281-3/+6
| | | | | | | | Some code paths can call it with invalid length. CC: libav-stable@libav.org (cherry picked from commit 71953ebcf94fe4ef316cdad1f276089205dd1d65) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* aac: return meaningful errorsLuca Barbato2013-10-281-28/+33
| | | | | | | | (cherry picked from commit 07c52e2c7c60b087fd023cd9771778973def0b33) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/aacdec.c
* dsicinav: K&R formatting cosmeticsLuca Barbato2013-10-281-49/+62
| | | | | | | | (cherry picked from commit fcae3ff124ee97c9265e3b93f3d41238b2aee9bd) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/dsicinav.c
* mov: Seek back if overreading an individual atomMartin Storsjö2013-10-281-0/+6
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Cc: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 5b4eb243bce10a3e8345401a353749e0414c54ca) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavformat/mov.c
* vcr1: add sanity checksAnton Khirnov2013-10-281-0/+21
| | | | | | | | | | | | Fixes invalid reads with corrupted files. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 8aba7968dd604aae91ee42cbce0be3dad7dceb30) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/vcr1.c
* pictordec: pass correct context to avpriv_request_sampleAnton Khirnov2013-10-281-2/+2
| | | | | | | | | | | | Fixes invalid reads. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry-picked from commit fe9bb61f9a16be19ad91875632c39e44b7a99a8a) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/pictordec.c
* dsicinav: Clip the source size to the expected maximumLuca Barbato2013-10-281-0/+2
| | | | | | | | | | | | | A packet larger than cin->bitmap_size does not make sense. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit fd8189932147a524fe43532b46baa35e8be92a1b) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/dsicinav.c
* alsdec: Clean up error pathsLuca Barbato2013-10-281-61/+76
| | | | | | | | | | | | Fix at least a memory leak. CC: libav-stable@libav.org (cherry picked from commit ca488ad480360dfafcb5766f7bfbb567a0638979) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/alsdec.c
* ogg: Fix potential infinite discard loopReimar Döffinger2013-10-281-1/+5
| | | | | | | | | | | | | | | | | Seeking in certain broken files would cause ogg_read_timestamp to fail because ogg_packet would go into a state where all packets of stream 1 would be discarded until the end of the stream. Bug-Id: 553 CC: libav-stable@libav.org Signed-off-by: Jan Gerber <j@v2v.cc> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 9a27acae9e6b7d0bf74c5b878af9c42495a546f3) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavformat/oggdec.c
* nuv: check rtjpeg_decode_frame_yuv420 return valueLuca Barbato2013-10-161-1/+4
| | | | | | | | | CC: libav-stable@libav.org (cherry picked from commit 85ac12587bfef970d0e0e4abc292df346daf8478) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/nuv.c
* nuv: Reset the frame on resizeLuca Barbato2013-10-161-0/+2
| | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/nuv.c
* nuv: Use av_fast_reallocLuca Barbato2013-10-161-4/+10
| | | | | | | | | | | | | The decompressed buffer can be used after codec_reinit, so it must be preserved. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 2df0776c2293efb0ac12c003843ce19332342e01) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/nuv.c
* nuv: return meaningful error codes.Anton Khirnov2013-10-161-13/+17
| | | | | | | | (cherry picked from commit 3344f5cb747bb1f54cc34878b66dc0536f194720) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/nuv.c
* nuv: Pad the lzo outbufLuca Barbato2013-10-161-3/+5
| | | | | | | | | | | | And properly update the buf_size with the correct size. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 075dbc185521f193c98b896cd63be3ec2613df5d) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/nuv.c
* nuv: Do not ignore lzo decompression failuresLuca Barbato2013-10-162-2/+3
| | | | | | | | | | | | | Update the fate reference since the last broken frame is not decoded anymore. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit aae159a7cc4df7d0521901022b778c9da251c24e) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/nuv.c
* oma: correctly mark and decrypt partial packetsLuca Barbato2013-10-161-2/+10
| | | | | | | | | | | | | Incomplete crypted files would lead to a read after buffer boundary otherwise. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 2219e27b5b17d146e4ab71a3ed86dfc013fb7a93) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavformat/omadec.c
* oma: check geob tag boundaryLuca Barbato2013-10-161-9/+24
| | | | | | | | | | | | Prevent read after buffer boundary on corrupted tag. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 9d0b45ade864f3d2ccd8610149fe1fff53c4e937) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavformat/omadec.c
* oma: refactor seek functionLuca Barbato2013-10-161-13/+17
| | | | | | | | | | Properly propagate seek errors from avio and the generic pcm seek. (cherry picked from commit 4f03a77e52596cbe9ec179666ddb3e0345a8133a) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavformat/omadec.c
* 8bps: Bound-check the input bufferLuca Barbato2013-10-161-3/+7
| | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/8bps.c
* rtmp: Do not misuse memcmpLuca Barbato2013-10-163-4/+45
| | | | | | | | | | CC: libav-stable@libav.org (cherry picked from commit 5718e3487ba3b26aba341070be0b6b0b4de45ea3) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavformat/rtmppkt.h libavformat/rtmpproto.c
* rtmp: rename data_size to sizeLuca Barbato2013-10-163-55/+55
| | | | | | | | | (cherry picked from commit ba5393a609c723ec8ab7f9727c10fef734c09278) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavformat/rtmppkt.c libavformat/rtmpproto.c
* lavc: set the default rc_initial_buffer_occupancyLuca Barbato2013-10-162-2/+3
| | | | | | | | | | | | | | rc_buffer_size is not set before. Solve the initial the rate control underflow issue reported in bug 222. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit bff3607547fdbb6e32b3830a351e6a33280c1e0d) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* 4xm: Reject not a multiple of 16 dimensionLuca Barbato2013-09-291-0/+6
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 2f034f255c49050e894ab9b88087c09ebe249f3f) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* 4xm: do not overread the prestream bufferLuca Barbato2013-09-291-2/+13
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit be373cb50d3c411366fec7eef2eb3681abe48f96) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* 4xm: validate the buffer size before parsing itLuca Barbato2013-09-291-6/+18
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit de2e5777e225e75813daf2373c95e223651fd89a) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* indeo: Do not reference mismatched tilesLuca Barbato2013-09-291-0/+2
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit f9e5261cab067be7278f73d515bc9b601eb56202) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* indeo: Sanitize ff_ivi_init_planes fail pathsLuca Barbato2013-09-293-2/+8
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 28dda8a691f1c723a4a9365ab85f9625f1330096) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* indeo: Bound-check before applying motion compensationLuca Barbato2013-09-291-12/+17
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 25a6666f6c07c6ac8449a63d7fbce0dfd29c54cd) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* indeo: Bound-check before applying transformLuca Barbato2013-09-294-18/+59
| | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit dc79685195a45c9b8b17d7b93d118e0aefa45462) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/ivi_common.c
* indeo: reject negative array indexesLuca Barbato2013-09-291-13/+29
| | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 6a10142faa1cca8ba2bfe51b970754f62d60f320) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* indeo: Cosmetic formattingLuca Barbato2013-09-291-14/+23
| | | | | | | | | | | Trim some overly long lines. (cherry picked from commit 6dfacd7ab126aea1392949d1aa10fdc3d3eeb911) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/ivi_common.c
* indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocksLuca Barbato2013-09-291-117/+142
| | | | | | | | | Spin large and mostly self contained blocks into stand alone functions. (cherry picked from commit 62256010e9bc8879e2bf7f3b94af8ff85e239082) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* indeo: Refactor ff_ivi_dec_huff_descLuca Barbato2013-09-291-30/+31
| | | | | | | | Spare an indentation level. (cherry picked from commit f6f36ca8ca1b2526d3abff7d7c627322d3bce912) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* lavf: fix the comparison in an overflow checkAnton Khirnov2013-09-231-1/+1
| | | | | | | | CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 26f027fba1c5ab482fa2488fbe0fa36c8bb33b69) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* dv: Add a guard to not overread the ppcm arrayLuca Barbato2013-09-231-2/+2
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 7ee191cab0dc44700f26c5784e2adeb6a779651b) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavformat/dv.c
* mpegvideo: Avoid 32-bit wrapping of linesize multiplicationsMartin Storsjö2013-09-231-1/+2
| | | | | | | | | | | This makes sure that linesize * start_y doesn't overflow, so that emulated_edge_mc can get back the original value if needed. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit a711a2cb473dc95708f371a82c85c97fe789b5c2) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* mjpegb: Detect changing number of planes in interlaced videoMichael Niedermayer2013-09-231-0/+7
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit af11fa5409cc72fc45ca7f3527400beca10967b9) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* matroskadec: Check that .lang was allocated and set before reading itMartin Storsjö2013-09-231-1/+2
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 5bcd3ae5b167fb74215520b01d5d810e0c8986ab) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* ape demuxer: check for EOF in potentially long loopsAnton Khirnov2013-09-231-1/+3
| | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry-picked from commit 488b2984fece7ad0c2596826fee18e74aa904667) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* lavf: avoid integer overflow when estimating bitrateAnton Khirnov2013-09-231-2/+7
| | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit df33a58e5311ee9a64a573889b883a80e981af7b) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* pictordec: break out of both decoding loops when y drops below 0Anton Khirnov2013-09-231-1/+2
| | | | | | | | | | Otherwise picmemset can get called with negative y, resulting in an invalid write. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 5f7aecde02a95451e514c809f2794c1deba80695) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* ac3: Return proper error codesLuca Barbato2013-09-231-15/+15
| | | | | (cherry picked from commit b1f9cdc37ff5d5b391d2cd9af737ab4e5a0fc1c0) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* ac3: Clean up the error pathsLuca Barbato2013-09-231-3/+6
| | | | | (cherry picked from commit 818d1f1a3e89d35213af0bd5dc4a772713951882) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* ac3: Do not clash with normal AVERRORLuca Barbato2013-09-231-7/+7
| | | | | | | | The parsing function return AVERROR and AAC_AC3_PARSE_ERROR values, make sure they are not misunderstood. (cherry picked from commit 6258d362b82934a2c27557e0984aed372d98091a) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* dxa: Make sure the reference frame existsLuca Barbato2013-09-231-0/+6
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 5ef7c84a9374681c64722a96d91741f3b990af2b) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/dxa.c
* h261: check the mtype indexLuca Barbato2013-09-231-0/+5
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit c59967fa7cc5bc2fa06b36c17d2c207240c06b3e) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/h261dec.c
* segafilm: Error out on impossible packet sizeLuca Barbato2013-09-231-0/+2
| | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 5268bd2900effa59b51e0fede61aacde5e2f0b95) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* ogg: Always alloc the private context in vorbis_headerLuca Barbato2013-09-231-3/+3
| | | | | | | | | It is possible to have an initial broken header and then valid packets. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 3562684db716d11de0b0dcc52748e9cd90d68132) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>