aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | sonic: update to new APIMichael Niedermayer2012-03-161-4/+17
| | | | | | | | | | | | | | | | | | Fixes Ticket1075 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6f9803e5e02c557e1003cface9f3084a7e1e43e4) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mmvideo: restore initial y value.Michael Niedermayer2012-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This bug might have been exploitable (out of HEAP buffer writes) Bug introduced by libav commit a55d5bdc6e28a2cfefc440d792de5cc4f02377e2 Date: Tue Mar 6 15:15:42 2012 -0800 algmm: convert to bytestream2 API. (cherry picked from commit c2e3b564b32d596f5a66d47409f9e07a067a3084) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/release/0.8' into release/0.10Michael Niedermayer2012-03-16134-1202/+1751
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/release/0.8: (154 commits) Update Changelog for the 0.8.1 Release dca: include libavutil/mathematics.h for possibly missing M_SQRT1_2 dca: don't use av_clip_uintp2(). snow: check reference frame indices. snow: reject unsupported chroma shifts. xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns. h264: increase reference poc list from 16 to 32. h264: stricter reference limit enforcement. h264: improve parsing of broken AVC SPS Replace computations of remaining bits with calls to get_bits_left(). png: convert to bytestream2 API. roqvideo: convert to bytestream2 API. smc: port to bytestream2 API. tgq: convert to bytestream2 API. algmm: convert to bytestream2 API. jvdec: unbreak video decoding h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction. libx264: add 'stats' private option for setting 2pass stats filename. libx264: fix help text for slice-max-size option. avconv: reindent ... Conflicts: Changelog RELEASE avconv.c doc/APIchanges ffplay.c libavcodec/Makefile libavcodec/aacdec.c libavcodec/alsdec.c libavcodec/atrac3.c libavcodec/avcodec.h libavcodec/dvdata.c libavcodec/fraps.c libavcodec/golomb.h libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_direct.c libavcodec/h264_parser.c libavcodec/h264_ps.c libavcodec/h264idct_template.c libavcodec/indeo3.c libavcodec/kgv1dec.c libavcodec/kmvc.c libavcodec/mjpegbdec.c libavcodec/mmvideo.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo.h libavcodec/options.c libavcodec/pngdec.c libavcodec/roqvideodec.c libavcodec/shorten.c libavcodec/svq3.c libavcodec/utils.c libavcodec/version.h libavcodec/wmadec.c libavcodec/xxan.c libavformat/Makefile libavformat/asfdec.c libavformat/dv.c libavformat/mov.c libavformat/nsvdec.c libavformat/utils.c libavformat/version.h libavutil/avutil.h libavutil/error.c libavutil/error.h libswscale/swscale.c libswscale/utils.c libswscale/x86/swscale_template.c tests/ref/acodec/g722 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Update Changelog for the 0.8.1 ReleaseReinhard Tartler2012-03-151-0/+30
| |
| * dca: include libavutil/mathematics.h for possibly missing M_SQRT1_2Kostya Shishkov2012-03-141-0/+1
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * dca: don't use av_clip_uintp2().Ronald S. Bultje2012-03-141-1/+1
| | | | | | | | | | | | | | The argument is not a literal, thus causing the ARM v6 or later builds to break. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * snow: check reference frame indices.Michael Niedermayer2012-03-141-9/+21
| | | | | | | | | | | | | | | | | | | | | | Fixes NULL ptr dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 1f8ff2b13cbfef790385818664ed12e763e7c75b) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * snow: reject unsupported chroma shifts.Michael Niedermayer2012-03-141-0/+5
| | | | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit c9837954e7b968d44f82e7cdb7618e9f523b196c) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns.Ronald S. Bultje2012-03-141-5/+20
| | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 86020073dbb9a3a9d1fbb76345b2ca29ba1f13d2) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * h264: increase reference poc list from 16 to 32.Ronald S. Bultje2012-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | Interlaced images can have 32 references (16 per field), so limiting the array size to 16 leads to invalid writes. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 48cbe4b092113eae0b3e5d6a08b59027f913a884) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * h264: stricter reference limit enforcement.Ronald S. Bultje2012-03-141-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | Progressive images can have only 16 references, error out if there are more, since the data is almost certainly corrupt, and the invalid value will lead to random crashes or invalid writes later on. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit e0febda22d0e0fab094a9c886b0e0f0f662df1ef) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * h264: improve parsing of broken AVC SPSMichael Niedermayer2012-03-142-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parsing the entire NAL as SPS fixes decoding of some AVC bitstreams with broken escaping. Since the size of the NAL unit is known and checked against the buffer end we can parse it entirely without buffer overreads. Fixes playback of http://streams.videolan.org/streams/mp4/Mr_MrsSmith-h264_aac.mp4 Signed-off-by: Janne Grunau <janne-libav@jannau.net> (cherry picked from commit 3aa661ec561d7a20812b84b353b0d7855ac346c8) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * Replace computations of remaining bits with calls to get_bits_left().Alex Converse2012-03-1410-19/+18
| | | | | | | | | | | | (cherry picked from commit 3574a85ce57366ba7429edef93d5cad8640fb68c) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * png: convert to bytestream2 API.Ronald S. Bultje2012-03-141-39/+30
| | | | | | | | | | | | | | | | | | | | Protects against overreads in the input buffer. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 4c25269cedd042abcb823c42d33609564861c374) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * roqvideo: convert to bytestream2 API.Ronald S. Bultje2012-03-142-36/+37
| | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit cdf15771621bce7959b3e53b21426c5ba747e17b) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * smc: port to bytestream2 API.Ronald S. Bultje2012-03-141-42/+32
| | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 8febcb9fc178926687ee19d32d2b3150da899867) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * tgq: convert to bytestream2 API.Ronald S. Bultje2012-03-141-28/+28
| | | | | | | | | | | | | | | | | | | | This protects against input buffer overreads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 1255eed533b4069db7f205601953ca54c0dc42c9) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * algmm: convert to bytestream2 API.Ronald S. Bultje2012-03-141-38/+51
| | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit a55d5bdc6e28a2cfefc440d792de5cc4f02377e2) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * jvdec: unbreak video decodingPaul B Mahol2012-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | The safe bitstream reader broke it since the buffer size was specified in bytes instead of bits. Signed-off-by: Janne Grunau <janne-libav@jannau.net> CC: libav-stable@libav.org (cherry picked from commit a1c036e961a32f7208e7315dabfa0ee99d779edb) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * h264: Fix invalid interlaced/progressive MB combinations for direct mode ↵Michael Niedermayer2012-03-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | prediction. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 758ec111538ccd487686e8677aa754ee4d82beaa) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * libx264: add 'stats' private option for setting 2pass stats filename.Anton Khirnov2012-03-141-0/+3
| | | | | | | | | | | | | | | | | | | | x264 always opens the file itself with fopen, so we cannot use the standard lavc stats mechanism. CC: libav-stable@libav.org (cherry picked from commit d533e395e14d403948ca2424efbcee92429ef8e1) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * libx264: fix help text for slice-max-size option.Anton Khirnov2012-03-141-1/+1
| | | | | | | | | | | | | | CC: libav-stable@libav.org (cherry picked from commit 9d5c131ecec75fcfb1b4b56f74f2b2756bf0027a) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * avconv: reindentAnton Khirnov2012-03-141-17/+17
| | | | | | | | | | | | | | CC: libav-stable@libav.org (cherry picked from commit 64334ddbbc7fce490c895c54106291d0b128e830) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * avconv: link '-passlogfile' option to libx264 'stats' AVOption.Anton Khirnov2012-03-141-0/+4
| | | | | | | | | | | | | | | | | | Fixes bug 204. CC: libav-stable@libav.org (cherry picked from commit 6e8be949f12734f38d360aad0f5c503a0f9606fa) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * Revert "h264: clear trailing bits in partially parsed NAL units"Janne Grunau2012-03-141-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 729ebb2f185244b0ff06d48edbbbbb02ceb4ed4e. There was an off-by-one error in the bit mask calculation clearing actually the last valid bit and causing http://bugzilla.libav.org/show_bug.cgi?id=227 The broken sample (Mr_MrsSmith-h264_aac.mp4) the commit was fixing does not work after correcting the off-by-one error. CC: libav-stable@libav.org (cherry picked from commit 8a6037c3900875ccab8d553d2cc659bdef2c9d0e) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * mpc: pad mpc_CC/SCF[] tables to allow for negative indices.Ronald S. Bultje2012-03-143-8/+12
| | | | | | | | | | | | | | | | | | | | | | MPC8 allows indices of mpc_CC up to -1, and mpc_SCF up to -6, thus pad the tables by that much on the left end. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit d7eabd50425a61b31e90c763a0c3e4316a725404) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * xxan: protect against chroma LUT overreads.Ronald S. Bultje2012-03-141-6/+8
| | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit f77bfa837636a99a4034d31916a76f7d1688cf5a) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * xxan: convert to bytestream2 API.Ronald S. Bultje2012-03-141-61/+56
| | | | | | | | | | | | | | | | | | | | Protects against overreads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 55188278169c3a1838334d7aa47a1f7a40741690) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * xxan: don't read before start of buffer in av_memcpy_backptr().Ronald S. Bultje2012-03-141-1/+2
| | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit f1279e286b00e99f343adb51e251f036a3df6f32) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * dsicinvideo: validate buffer offset before copying pixels.Ronald S. Bultje2012-03-141-15/+25
| | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit c95fefa0420be9cc0f09a95041acf11114aaacd0) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * cook: error out on quant_index values outside [-63, 63] range.Ronald S. Bultje2012-03-141-14/+36
| | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 97e48b2f541396ef6e8816a555bac1bb993d7a6a) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * cook: extend channel uncoupling tables so the full bit range is covered.Ronald S. Bultje2012-03-142-7/+24
| | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 37cc8600d0313838cab5b886b9d373e5819aa24f) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * cook: expand dither_tab[], and make sure indexes into it don't overflow.Ronald S. Bultje2012-03-132-3/+7
| | | | | | | | | | | | | | | | | | | | Fixes overflows in accessing dither_tab[]. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 442c3a8cb1785d74f8e2d7ab35b1862b7088436b) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * huffyuv: add padding to classic (v1) huffman tables.Ronald S. Bultje2012-03-131-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | We slightly overread the input buffer, so we require padding at the end of the buffer, as is documented in the get_bits API. Without padding, we'll read uninitialized data or beyond the end of the .rodata, which may crash. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 4ffe5e2aa5241f8da9afd2c8fbc854dcc916c5f9) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * avs: fix infinite loop on end-of-stream.Ronald S. Bultje2012-03-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The codec would keep returning the last decoded frame if the stream contains B-frames, since it wouldn't clear that frame from the list of frames to be returned to the user. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 83f15a1228895434a982c840b09edccd1c64e800) Conflicts: libavcodec/cavsdec.c Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * tiffdec: Prevent illegal memory access caused by recycled pointers.Alex Converse2012-03-131-0/+2
| | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit fd0be63049ed46660993d0550a4f0847a0b942ea) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * wma: fix off-by-one in array bounds check.Ronald S. Bultje2012-03-131-1/+1
| | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit b4bccf3e4e58f6fe58043791ca09db01a4343fac) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * dv: check buffer size before reading profile.Ronald S. Bultje2012-03-131-3/+5
| | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit e97efecec82ca8458a9bbd75a91ebf556abde362) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * raw: move buffer size check up.Ronald S. Bultje2012-03-131-3/+3
| | | | | | | | | | | | | | | | | | | | This way, it protects against overreads for 4bpp/2bpp content also. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit cc5dd632cecc5114717d0b90f8c2be162b1c6ee8) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * dca: prevent accessing static arrays with invalid indexes.Ronald S. Bultje2012-03-132-12/+27
| | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit e6ffd997cbc06426e75d3fa291b991866c84a79b) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * lpcm: fix sample size calculation for 20bit LCPM.Ronald S. Bultje2012-03-131-1/+1
| | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit f1320dc3bed281bb2f3c5531c52b6a6246e2394a) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * smacker: error out if palette copy-with-offset overruns palette size.Ronald S. Bultje2012-03-131-1/+8
| | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit a93b572ae4f517ce0c35cf085167c318e9215908) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * Don't use ff_cropTbl[] for IDCT.Ronald S. Bultje2012-03-089-201/+161
| | | | | | | | | | | | | | | | | | | | | | Results of IDCT can by far outreach the range of ff_cropTbl[], leading to overreads and potentially crashes. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit c23acbaed40101c677dfcfbbfe0d2c230a8e8f44) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * swscale: make filterPos 32bit.Ronald S. Bultje2012-03-087-38/+41
| | | | | | | | | | | | | | | | | | | | Fixes overflows for large image sizes. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 2254b559cbcfc0418135f09add37c0a5866b1981) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * error_resilience: initialize s->block_index[].Ronald S. Bultje2012-03-081-0/+20
| | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 6193ff68549ecbaf1a4d63a0e06964ec580ac620) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * svq3: protect against negative quantizers.Ronald S. Bultje2012-03-081-1/+1
| | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 11b940a1a8e7e5d5b212935a3ce78aeda577f5f2) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * Prepare for 0.8.1 ReleaseReinhard Tartler2012-03-081-1/+1
| |
| * mov: set channel layout for AC-3 streams based on the 'dac3' atom infoJustin Ruggles2012-03-086-5/+10
| | | | | | | | | | | | | | fixes Bug 225 (cherry picked from commit 3798205a77ce275613098ecb48645e6029811f14) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * rv34: handle size changes during frame multithreadingJanne Grunau2012-03-081-64/+82
| | | | | | | | | | | | | | | | Factors all context dynamic memory handling to its own functions. Fixes bug 220. (cherry picked from commit 2bd730010da24d035639586bb13862abe36cc1b8) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * mov: Add more HDV and XDCAM FourCCs.Alex Converse2012-03-061-0/+4
| | | | | | | | | | Reference: VLC (cherry picked from commit b142496c5630b9bc88fb9eaccae7f6bd62fb23e7)