summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update for 0.9.1n0.9.1Michael Niedermayer2012-01-053-3/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* vc1dec: fix invalid memory access for small video dimensionsJohn Brooks2012-01-051-1/+5
| | | | | | | | | | | | | | For small video dimensions, these calculations of the upper bound for pixel access may have a negative result. Using an unsigned comparison to bound a potentially negative value only works if the greater operand is non-negative. Fixed by doing edge emulation when the upper bound is probably negative, everywhere that this pattern appears. Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com> (cherry picked from commit d209c27b09234cc40bbdbd680aa502b493edf595) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* rv34: fix invalid memory access for small video dimensionsJohn Brooks2012-01-051-2/+3
| | | | | | | | | | | | For small video dimensions calculations of the upper bound for pixel access may result in negative value. Using an unsigned comparison works only if the greater operand is non-negative. This is fixed by doing edge emulation explicitly for such conditions. Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com> (cherry picked from commit aacf6b3a2fd8bc8603e3deaa6e612ea03cf08707) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Revert "rmdec: Avoid allocating huge packets"Michael Niedermayer2012-01-051-2/+0
| | | | | | | | | This reverts commit 66f71f3b5e2e7b6e5049bd9831c371e16aff8a53. This causes regressions with RDT. (cherry picked from commit c4eec85a1fa768025f88261995af08f1dba9685d) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: use avg_frame_rate and packet number to exit find_stream_infoMichael Niedermayer2012-01-051-2/+7
| | | | | | | | | | qatar does this too but clobbers the AVPacket.duration by approximate values. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ad8e3304f701820f927527d8f0d11679738636df) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: revert commit bb99ae3ae924c942a634bec7711ec7ee11c38eb9Michael Niedermayer2012-01-051-3/+0
| | | | | | | | | | | | | | | | Author: Michael Niedermayer <michaelni@gmx.at> Date: Thu Nov 3 22:38:10 2011 +0100 lavf: fix null pointer dereference in rdt Signed-off-by: Michael Niedermayer <michaelni@gmx.at> This is no longer needed and causes various problems with RTSP Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1171d938af219aa1217a472391bc392f6e698386) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* vorbis: make sure ch is non zero before calling vorbis_residue_decodeMichael Niedermayer2012-01-041-3/+5
| | | | | | | | | This possibly makes part of the CVE-2011-3895 fix unneeded. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ff7f198d7f9504f71676327be0be47661cfe39d6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* vorbis: An additional defense in the Vorbis codec.Chris Evans2012-01-041-10/+25
| | | | | | | | | | | | BUG=101458 Review URL: http://codereview.chromium.org/8414025 Fixes second part of CVE-2011-3895 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f74ce3a60d6ef49080df85c44b54280357109f56) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* vorbis: Fix decoder bug.Chris Evans2012-01-041-1/+7
| | | | | | | | | | | | BUG=101458 Review URL: http://codereview.chromium.org/8413019 This fixes part of 2011-3895 bigned-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 68226ed9ecef675895dc55a0c58d587014639a0e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* vorbisdec: Make sure blocksize is not set to an invalid value.Michael Niedermayer2012-01-041-2/+2
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 405e99bdfdb363e8dfda275faad9d4fdc9646434) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* vorbis: Fix last quarter of CVE-2011-3893Michael Niedermayer2012-01-041-1/+1
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6fcf2bb8af0e7d6bb179e71e67e5fab8ef0d2ec2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ogg: Avoid the possibility to read out-of-bounds of a static global array in ↵Chris Evans2012-01-041-2/+2
| | | | | | | | | | | | | | | Vorbis decoding. BUG=100543 Review URL: http://codereview.chromium.org/8365014 This fixes 25% of CVE-2011-3893 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7149fce2cac0474a5fbc5b47add1158cd8bb283e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mkv: Fix a bug where a pointer was cached to an array that might later move ↵Chris Evans2012-01-041-1/+1
| | | | | | | | | | | | | | | due to a realloc() BUG=100492 Review URL: http://codereview.chromium.org/8366004 Fixes: 1 of 2 for CVE-2011-3893 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f35e037c93cf7d25e65b4a2ed3674358f05e4bed) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Fix possible infinite loop decoding als.Philippe Saint-Pierre2012-01-041-1/+1
| | | | | | | Reviewed-by: Thilo Borgmann (cherry picked from commit f0f2babca23a3d099bcd5a1e18cf5d0eae2f4ef3) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* jpegdec: Fix vlc table check for progressive jpegs.Michael Niedermayer2012-01-041-1/+1
| | | | | | | | | Fixes Ticket834 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 15b219fae9da1691dfb264f51637805e1ca63d1a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* electronicarts: Pass error through ea_read_header().Michael Niedermayer2012-01-041-1/+1
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f37174bc1913d534913e8825f1609a637cc4b364) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* electronicarts: Fix division by zero. Fixes Ticket #793Oana Stratulat2012-01-041-0/+4
| | | | | | | | Signed-off-by: Oana Stratulat <oanaandreeastratulat@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 0d3a51e5d279dd2a56c81ba7a81a70128c5a7545) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Revert "wavpack: Clip samples after shifting"Carl Eugen Hoyos2012-01-041-2/+2
| | | | | | | This reverts commit 8d055e9079f151f13d34e8e04f4aa7ca0273c448. The original commit introduced ticket #871, do not import the problem into the release branch.
* vf_drawtext: select YUV color for drawbox() in case YUV colorspace is usedStefano Sabatini2012-01-041-1/+1
| | | | | | Fix box alpha rendering when a YUV colorspace is selected, in particular fix trac ticket #763. (cherry picked from commit 1858a5c25ee1ccb8089339d20138116a46cc6c77)
* wavpack: determine sample_fmt before requesting a bufferHendrik Leppkes2012-01-031-13/+18
| | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com> (cherry picked from commit 14165fe1256e0f11ba3d9cf574492ae528e5c9cf) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Added yuva420p decoding support for libopenjpegMichael Bradshaw2012-01-031-1/+10
| | | | | | | | Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2ba3416362345f275c63e70f44f4cfbf9b66fb35) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Added RGBA and YUV440 decoding support for libopenjpeg decoderMichael Bradshaw2012-01-031-0/+2
| | | | | | | | Reviewed-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3f07ef1dfff036a6b35c1605e6346bad2e17da68) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Fixed openjpeg decoding bug with width/linesize issueMichael Bradshaw2012-01-031-2/+2
| | | | | | | | | | The original code wasn't taking into account the fact that linesize may not equal the frame's width. This is to correct that. Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d1669e5fe3d61dc4181f96138eb4355aaaf231ea) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* jpegdec: non interleaved rgb ljpeg support.Michael Niedermayer2012-01-031-7/+8
| | | | | | | | | Fixes Ticket856 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 45552371e3434fb7aa4d0bc566fd4ef954f9af14) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* jpegdec: 9-16 bit yuv/gray ljpeg support.Michael Niedermayer2012-01-031-9/+50
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 465eb0eb48a14f5308d7fa52c388e7be7170cc3e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* jpegdec: Only enable rgb mode when there are 3 components.Michael Niedermayer2012-01-031-1/+1
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 24964f21e4976edab156dc934c3b5ec3746b16eb) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* bmv audio: implement new audio decoding APIJustin Ruggles2012-01-031-9/+25
| | | | | | (cherry picked from commit 8893fbdf7a5b941ce353fd560817ae6a2c34cfff) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* y41p encoder and decoderPaul B Mahol2012-01-0310-1/+226
| | | | | | | | | | | | | | | | y41p is a packed 12-bit 4:1:1 YUV format used by Brooktree. Fixes issue 1123 / ticket #102. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit dfa77dead2c97ec84092066102b14a2524d4d88b) Conflicts: Changelog libavcodec/version.h Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2kdec: av_log formatting use %tx instead of %xJean First2012-01-031-1/+1
| | | | | | | | Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b1031562351d81fb56f9338df5876dc2153d9f26) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Update copyright year.Carl Eugen Hoyos2012-01-031-1/+1
| | | | | | (cherry picked from commit 8dc973e6d1442e6427dfcb9817f9d15695555465) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mpegpsenc: Fix integer overflow of the muxrate calculation.Michael Niedermayer2012-01-031-1/+1
| | | | | | | | | this should fix the failure of h264-bsf-mp4toannexb on freebsd/openbsd Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 490c97bdf5ed1c6f05abe4446e67e598881fc53f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Avoid uninitialized data in lcldec when ofs is 0 in MSZH.Reimar Döffinger2012-01-032-4/+7
| | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> (cherry picked from commit 42a1f1d7a8cf67eed68db596d6a1e53c0c36e4ab) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: ffio_limit(), treat avio_size()==0 as error.Michael Niedermayer2012-01-031-1/+1
| | | | | | | | | | | This works around issues arising from inputs that claim to have a filesize of 0. Reported-by: buzz_ Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e6362f3a3cfbabf457fc7ebb2205cbfc043501ee) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* flvdec: Check avpriv_mpeg4audio_get_config() returnMichael Niedermayer2012-01-031-2/+3
| | | | | | | | | value before using its output. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5500e65342a2afc5caa8fe38496aa1a3b1f28cbc) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* cache: use av_freep instead of av_free in cache_openJean First2012-01-031-1/+1
| | | | | | | | Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 576ada791a5085b7427c9062ba4f65e811914bd0) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mlp_parser: Fix infinite loop with 0 bytes_left.Michael Niedermayer2012-01-031-0/+3
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e146ad95d79b1a6e6b9e566366b832825c79679f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Avoid av_memcpy_backptr hang without extra branch.Reimar Döffinger2012-01-032-4/+7
| | | | | | | | | | | This only happens for a "back" value of 0 which is invalid anyway, but lcldec does not properly validate input. Also extend the documentation to specify valid values. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> (cherry picked from commit 874da652b307fe0d2bec08fc5916a9a82537f40c) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ljpegdec: fix point transform injection.Michael Niedermayer2012-01-031-1/+1
| | | | | | | | | Fix Ticket842 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b0143da80656f286b3e2363f3ddb6f81c4a0fbf5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* flvdec: Check index for being validMichael Niedermayer2012-01-031-1/+10
| | | | | | | | | Fixes seeking in Enigma_Principles_of_Lust.flv Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit df0bff6643cadbd9c07bbe2b0536a7c9d0dfe0c6) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* nsvdec: Check av_malloc(string_size)Michael Niedermayer2012-01-031-0/+2
| | | | | | | | | This can easily be NULL as string_size can be 2g in a damaged file. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit b9e0e9537a3ec4af1630e9f1b8d0ce68885cac16) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* indeo5: Fix null pointer dereferences of ref_mbMichael Niedermayer2012-01-031-3/+3
| | | | | | | | Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f41a6c8f3aeb51332bb359038cb504d3fb562a52) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* h264_mp4toannexb_filter: pass error code through.Michael Niedermayer2012-01-031-5/+7
| | | | | | | | | Bug-Found-by and Suggested bugfix: Tanami, Ohad Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7ae251b4d8a18bc63734e58f1baafac634c67e01) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* issdemux: Check packet_size for validityMichael Niedermayer2012-01-031-0/+5
| | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit bf5cc805190b5811b786a454f01cccf9a7e366b9) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* qpeg: Check for overread in qpeg_decode_intra.Michael Niedermayer2012-01-031-3/+9
| | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e7c1e38ba632f7315e332dd350b38f782f428884) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* indeo5: fix division by 0 in ff_ivi_init_tiles()Michael Niedermayer2012-01-031-0/+2
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 92e2b59dec8c0124a209ce24f23450df9607d9d8) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* indeo5: Fix crash due to partially initialized gop vars.Michael Niedermayer2012-01-031-3/+4
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d46bc4133c104188dd6719365605e42bd1b5e2ff) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* indeo5: fix null pointer crash with ref_mbMichael Niedermayer2012-01-031-1/+1
| | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 4b35ee0b7c0c4cbac3541a25a5e8c00b657c8f95) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* vcr1dec: Check that there is sufficient input data.Michael Niedermayer2012-01-031-0/+5
| | | | | | | | | Fixes crash. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 8e09482e4d27d65bbce2ce5c2f4392216011ed09) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* v410dec: Check for sufficient input data.Michael Niedermayer2012-01-031-0/+5
| | | | | | | | | Fixes crash Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 11ca3416f92744f376c08e5f31bcbe5d9b44acb2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Indeo 4 decoderKostya Shishkov2012-01-039-3/+1364
| | | | | | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com> (cherry picked from commit adfe0c942e71545f003f9c4d148fbf5d220681bc) Conflicts: Changelog libavcodec/version.h Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status