summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update for 0.8.5n0.8.5Michael Niedermayer2011-10-023-3/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* h264: fix intra 16x16 mode check when using mbaff and constrained_intra_pred.Laurent Aimar2011-10-025-13/+32
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a4fd95b5d511384ed3ce388d8d20a16b1c4c0530)
* h264: check for invalid bit depth value.Laurent Aimar2011-10-021-0/+5
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c2b7f7748be447e1446f63b13da472ba7e00f329)
* h264: add entries for 11 and 12 bits in ff_h264_chroma_qp[][]Laurent Aimar2011-10-022-3/+16
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 27d3361e34cf19ad5c0bfb7cfacae0db99b26064)
* h264: fix the check for invalid SPS:num_ref_frames.Laurent Aimar2011-10-021-1/+1
| | | | | | | | | | | | This patch set the limit to 16. For information, thoses previous commits: 41f7e2d11d2dca23842ee89d530ca9fa15cec9d8 5cbb0e70a0a2ee99eb3cb09e837b9a1f7355b9bc assumed it was either 30 or 32. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bcf881a6858760ecbd9ff4352a38813dc4232dd6)
* h264: do not let invalid values in h->ref_count on ↵Laurent Aimar2011-10-021-1/+3
| | | | | | | ff_h264_decode_ref_pic_list_reordering() errors. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2428b53f6d306d8d71dec34fa7b0af733d76cfac)
* Reject video with non multiple of 16 width/height in the 4xm decoder.Laurent Aimar2011-10-021-0/+4
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit db5b4875514eb7740844f514dbf236c9179a6a93)
* 4xm decoder: fix data size for i2 frames.Michael Niedermayer2011-10-021-1/+1
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0a19b4b0bae772cac7f8341e94c319c96356ee69)
* 4xm decoder: print some error messages in case of errors.Michael Niedermayer2011-10-021-9/+27
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1008f639e2ebaa2b3d48ac765ca49c8869042d75)
* Check for out of bound accesses in the 4xm decoder.Laurent Aimar2011-10-021-13/+46
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9c661e952fbcbf044709f9a7031c68cc4860336b)
* Prevent block size from inreasing in the shorten decoder.Laurent Aimar2011-10-021-2/+8
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b399cbfba5d901608c18e1a2d48a24c30541a634)
* Check for out of bound reads in PTX decoder.Laurent Aimar2011-10-021-0/+8
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 581898ae882dc37967b689b6ea5f2b2a9acd257a)
* Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffers ↵Laurent Aimar2011-10-021-0/+2
| | | | | | | used in 4xm decoder. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 90a69b2f61cbd2d58723d712bdf283e5e56b2ea2)
* Fix the check for missing references in ff_er_frame_end() for H264.Laurent Aimar2011-10-021-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Prevent NULL dereference when the huffman table is invalid in the 4xm decoder.Laurent Aimar2011-10-021-3/+4
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4a8ff0636d67c6df059f2ae2df49ad1181de14ca)
* Fix use of uninitialized memory in 4X Technologies demuxer.Laurent Aimar2011-10-021-2/+4
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a1876e0072aa0c69f037e0cafaca1a54bf2e189b)
* h264: increase ref_poc size to 32 as it can be per field.Michael Niedermayer2011-10-021-1/+1
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8c851ef5a81fb0429453c43fdcfc974ce1b6e447)
* h264: set unused ref_counts to 0 as a precautionary meassure.Michael Niedermayer2011-10-021-1/+1
| | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3af2de76ac8b7aa762e4ee129ec29140e6247d81)
* Remove Chnagelog it has nothing to do with realityMichael Niedermayer2011-10-011-764/+0
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/release/0.7' into release/0.8Michael Niedermayer2011-10-0115-30/+104
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/release/0.7: (73 commits) Update Changelog for 0.7.2 release Update RELEASE file for 0.7.2 lavf: do not set codec_tag for rawvideo fate: allow testing with libavfilter disabled fate: separate lavf-mxf_d10 test from lavf-mxf Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080. movenc: fix NULL reference in mov_write_tkhd_tag movenc: create an alternate group for each media type flvdec: Check for overflow before allocating arrays ppc: fix some pointer to integer casts ppc: fix 32-bit PIC build rv34: Check for invalid slice offsets rv34: Fix potential overreads rv34: Avoid NULL dereference on corrupted bitstream rv10: Reject slices that does not have the same type as the first one lavf: Fix context pointer in av_open_input_stream when avformat_open_input fails oggdec: fix out of bound write in the ogg demuxer Fixed size given to init_get_bits(). smacker: fix a few off by 1 errors Check for invalid VLC value in smacker decoder. ... Conflicts: RELEASE libavcodec/avs.c libavcodec/ppc/asm.S libavcodec/rv34.c libavcodec/xan.c libavdevice/alsa-audio.h libavformat/flvdec.c libavformat/gxf.c libavformat/utils.c libswscale/x86/swscale_template.c tests/ref/lavf/mov tests/ref/lavf/mxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Update Changelog for 0.7.2 releaseReinhard Tartler2011-09-301-0/+43
| |
| * Update RELEASE file for 0.7.2Reinhard Tartler2011-09-301-1/+1
| |
| * lavf: do not set codec_tag for rawvideoMans Rullgard2011-09-301-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the demuxer did not set a codec_tag, there is none and inventing one makes no sense. This change stops the rawvideo "decoder" over-writing user-supplied pixfmt with one derived from the codec_tag. The pixfmt-codec_tag-pixfmt round-trip is lossy since several pixfmts map to the same codec_tag. This fixes fate-lavf-pixfmt with avfilter disabled. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit bb416bd68ca46b4a3f1901533064d56a6b8ac95e) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * fate: allow testing with libavfilter disabledReinhard Tartler2011-09-303-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This declares dependencies to skip tests using libavfilter when it is disabled. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 908f12f342341785bf0458e88a06d97a1af90339) Conflicts: configure tests/Makefile tests/fate.mak Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * fate: separate lavf-mxf_d10 test from lavf-mxfMans Rullgard2011-09-304-4/+7
| | | | | | | | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 0218808d4980b794c78f57931d671508aed500b5) required to unbreak fate with --disable-avfilter Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.Michael Niedermayer2011-09-281-8/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitespace of the patch cleaned up by Aurel Some of the issues have been reported by Steve Manzuik / Microsoft Vulnerability Research (MSVR) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 956c901c68eff78288f40e3c8f41ee2fa081d4a8) Further suggestions from Kostya <kostya.shishkov@gmail.com> have been implemented by Reinhard Tartler <siretart@tauware.de> (cherry picked from commit 77d2ef13a8fa630e5081f14bde3fd20f84c90aec) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * movenc: fix NULL reference in mov_write_tkhd_tagAnton Khirnov2011-09-271-1/+1
| | | | | | | | | | | | | | | | | | st may be NULL when there are more mov streams than AVStreams, e.g. when chapters are present. (cherry picked from commit c92a2a4eb8b883e82871c2415f757153d263b6b3) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * movenc: create an alternate group for each media typeAnton Khirnov2011-09-274-7/+8
| | | | | | | | | | | | | | | | Partially fixes bug 44. (cherry picked from commit 7574cacbd5343bc303ee8333956274716e2444d5) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * flvdec: Check for overflow before allocating arraysMichael Niedermayer2011-09-261-0/+3
| | | | | | | | | | | | | | | | | | | | On allocation, the array length is multiplied by sizeof(int64_t), this prevents the multiplication from overflowing. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit a246cefa75aed2ade315d6d09068aacb6b0fe76b) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * ppc: fix some pointer to integer castsMans Rullgard2011-09-261-5/+5
| | | | | | | | | | | | | | | | | | | | | | Use uintptr_t instead of plain int. Without this change, the comparisons will come out wrong for pointers in certain ranges. Fixes random failures on ppc64. Also fixes some compiler warnings. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit d853e571ad5e7e12c6a68cfde390daced7d85fbb) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * ppc: fix 32-bit PIC buildMans Rullgard2011-09-262-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On 32-bit ppc, the GOT pointer must be loaded manually. This adds a "get_got" assembler macro to compute the GOT address. The "movrel" macro is updated to take an additional parameter containing the GOT address since no register is reserved for this purpose on ppc32. These changes have no effect on ppc64 builds. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 6e4a35ced96cdf31a9d3bd82fd147554750af839) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * rv34: Check for invalid slice offsetsLaurent Aimar2011-09-261-4/+5
| | | | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 4cc7732386eb36661ed22d1200339b38a5fa60bc) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * rv34: Fix potential overreadsLaurent Aimar2011-09-261-2/+3
| | | | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit b4ed3d78cb6c41c9d3ee5918c326ab925edd6a89) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * rv34: Avoid NULL dereference on corrupted bitstreamLaurent Aimar2011-09-261-1/+1
| | | | | | | | | | | | | | | | | | rv34_decode_slice() can return without allocating any pictures. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit d0f6ab0298f2309c6104626787ed73416298b019) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * rv10: Reject slices that does not have the same type as the first oneLaurent Aimar2011-09-261-0/+5
| | | | | | | | | | | | | | | | | | This prevents crashes with some corrupted bitstreams. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 4a29b471869353c3077fb4b25b6518eb1047afb7) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * lavf: Fix context pointer in av_open_input_stream when avformat_open_input failsDavid Goldwich2011-09-261-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: David Goldwich <david.goldwich@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 63d64228a7f31d534e3bcae87cbd37f4a0ae2dd6) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * oggdec: fix out of bound write in the ogg demuxerLaurent Aimar2011-09-261-2/+12
| | | | | | | | | | | | | | | | | | | | Between ogg_save() and ogg_restore() calls, the number of streams could have been reduced. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 0e7efb9d23c3641d50caa288818e8c27647ce74d) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Fixed size given to init_get_bits().Laurent Aimar2011-09-266-6/+6
| | | | | | | | | | | | | | | | | | | | init_get_bits() takes a number of bits and not a number of bytes as its size argument. Signed-off-by: Alex Converse <alex.converse@gmail.com> (cherry picked from commit b59efc94347ccf0cbc2ff14a5a9e99819c5bdc4d) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * smacker: fix a few off by 1 errorsMichael Niedermayer2011-09-262-84/+84
| | | | | | | | | | | | | | | | | | stereo & 16bit is untested due to lack of samples Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 5166376f24545207607f61ed8ff4e1b0572ff320) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Check for invalid VLC value in smacker decoder.Laurent Aimar2011-09-261-0/+2
| | | | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 6489455495fc5bfbebcfe3f57e5d4fdd6a781091) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Check and propagate errors when VLC trees cannot be built in smacker decoder.Laurent Aimar2011-09-261-8/+12
| | | | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 9676ffba8346791f494451e68d2a3b37a2918a9b) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Fixed off by one packet size allocation in the smacker demuxer.Laurent Aimar2011-09-261-1/+1
| | | | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit a92d0fa5d234582583d41b67dddecffc2c819573) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Check for invalid packet size in the smacker demuxer.Laurent Aimar2011-09-261-0/+2
| | | | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit e055932f5636a82275837968eea9c8fcb5bca474) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * ape demuxer: fix segfault on memory allocation failure.Laurent Aimar2011-09-261-0/+2
| | | | | | | | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 273aab99bf7be2bcda95dd64101c2317ee0fcb99) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * xan: Add some buffer checksAlex Converse2011-09-261-8/+29
| | | | | | | | | | | | (cherry picked from commit 0872bb23b4bd2d94a8ba91070f706d1bc1c3ced8) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Fixed size given to init_get_bits() in xan decoder.Laurent Aimar2011-09-261-4/+6
| | | | | | | | | | | | (cherry picked from commit 393d5031c6aaaf8c2dda4eb5d676974c349fae85) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * smacker demuxer: handle possible av_realloc() failure.Kostya Shishkov2011-09-261-1/+6
| | | | | | | | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 47a8589f7bc69d1a29da1dfdfbd0dfa78a9e31fd) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks.Laurent Aimar2011-09-261-2/+3
| | | | | | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 8bfea4ab4e2cb32bc7bf6f697ee30a238c65d296) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * cljr: init_get_bits size in bits instead of bytesAlex Converse2011-09-261-1/+1
| | | | | | | | | | | | (cherry picked from commit 0c1f5b93d9b97c4cc3684ba91a040e90bfc760d2) Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * indeo2: fail if input buffer too smallAlex Converse2011-09-261-1/+7
| | | | | | | | | | | | (cherry picked from commit b7ce4f1d1c3add86ece7ca595ea6c4a10b471055) Signed-off-by: Anton Khirnov <anton@khirnov.net>