aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* atrac3: Error on impossible encoding/channel combinationsLuca Barbato2013-08-241-2/+4
| | | | | | | | | | Joint stereo encoded mono is impossible. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 50cf5a7fb78846fc39b3ecdaa896a10bcd74da2a) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* atrac3: set the getbits context the right buffer_endLuca Barbato2013-08-241-1/+1
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 22e76ec635bafdd1d1ec35581a7ac09e69e3c43e) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* atrac3: fix error handlingLuca Barbato2013-08-241-2/+2
| | | | | | | | | | decode_tonal_components returns a proper AVERROR. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 874c8a17ac9b04fb7ac23d003e54e3662dd23b4e) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* qdm2: check and reset dithering index per channelLuca Barbato2013-08-241-2/+1
| | | | | | | | | | | Checking per subband would have the index exceed the dithering noise table size. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 744a11c996641888d477a3981d609e79eeb69ea9) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* qdm2: formatting cosmeticsLuca Barbato2013-08-241-187/+204
| | | | | | | | | Apply the usual style plus drop few unnecessary return at the end of void functions. (cherry picked from commit 76efedeadb1f6bf79020c44a71dd0cee13d932ad) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* qdm2: use init_static_dataLuca Barbato2013-08-241-128/+148
| | | | | | (cherry picked from commit f054e309c58894450a5d18cce9799ef58aab9f14) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* westwood_vqa: do not free extradata on error in read_headerLuca Barbato2013-08-241-2/+0
| | | | | | | | | | | The extradata is already freed by avformat_open_input on failure. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 76f5dfbfd902178df4a38221a68dc8540189345a) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* vqavideo: check the versionLuca Barbato2013-08-241-0/+11
| | | | | | | | | | Prevent out of buffer write. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit c4abc9098cacb227dba39bac6aea16b2bceba0d0) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* rmdec: Use the AVIOContext given as parameter in rm_read_metadata()Michael Niedermayer2013-08-241-6/+6
| | | | | | | | | | | | | | | | | | This fixes crashes when playing back certain RealRTSP streams. When invoked from the RTP depacketizer, the full realmedia demuxer isn't invoked, but only certain functions from it, where a separate AVIOContext is passed in as parameter (for the buffer containing the data to parse). The functions called from within those entry points should only be using that parameter, not s->pb. In the depacketizer case, s is the RTSP context, where ->pb is null. Cc: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit d35b6cd3775456a23b63e73316e244b671caa02f) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* avio: Handle AVERROR_EOF in the same way as the return value 0Michael Niedermayer2013-08-241-1/+1
| | | | | | | | | | | | This makes sure the ffurl_read_complete function actually returns the number of bytes read, as the documentation of the function says, even if the underlying protocol uses AVERROR_EOF instead of 0. Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 5d876be87a115b93dd2e644049e3ada2cfb5ccb7) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* wtv: Mark attachment with a negative stream idLuca Barbato2013-08-241-0/+1
| | | | | | | | | | | | A sid 0 would be mismatched to the attachment. Prevent NULL pointer dereference. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit f5e646a00ac21e500dae4bcceded790a0fbc5246) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* avconv: do not use lavfi direct rendering with -deinterlaceAnton Khirnov2013-08-041-1/+1
| | | | | | | | | | -deinterlace allocates a temporary buffer that is freed immediately after the frame is sent to lavfi, which results in use after free. Disable direct rendering when -deinterlace is used. CC:libav-stable@libav.org Bug-id: 479
* avidec: Let the inner dv demuxer take care of discardingLuca Barbato2013-07-271-3/+6
| | | | | | (cherry picked from commit c8f0b20b4a6bb6691928789d83e4b) CC: libav-stable@libav.org
* Update ChangelogReinhard Tartler2013-07-061-0/+3
|
* kmvc: Clip pixel position to valid rangeLuca Barbato2013-07-061-1/+2
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 4e7f0b082d8c4b360312216b9241bec65ff63b35) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* kmvc: use fixed sized arrays in the contextLuca Barbato2013-07-061-21/+1
| | | | | | | | | | | Avoid some boilerplate code to dynamically allocate and then free the buffers. (cherry picked from commit 8f689770548c86151071ef976cf9b6998ba21c2a) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavcodec/kmvc.c
* indeo: reject negative array indexesLuca Barbato2013-07-061-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-07-061-20/+32
| | | | | | | | Trim some overly long lines. (cherry picked from commit 6dfacd7ab126aea1392949d1aa10fdc3d3eeb911) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocksLuca Barbato2013-07-061-120/+153
| | | | | | | | | 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-07-061-30/+32
| | | | | | | | Spare an indentation level. (cherry picked from commit f6f36ca8ca1b2526d3abff7d7c627322d3bce912) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* indeo: use a typedef for the mc function pointerLuca Barbato2013-07-061-4/+5
| | | | | | (cherry picked from commit e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* indeo: use proper error codeLuca Barbato2013-07-061-1/+1
| | | | | | (cherry picked from commit dd3754a48854cd570d38db72394491aab0f36570) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* Update ChangelogReinhard Tartler2013-07-061-0/+13
|
* indeo: check for reference when inheriting mvsLuca Barbato2013-07-041-1/+1
| | | | | | | | | | The same is done already for qdelta. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit b36e1893ef3430f039c1eaddeedcbb378f9c4444) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* indeo: use proper error codeLuca Barbato2013-07-041-8/+8
| | | | | | (cherry picked from commit dd3754a48854cd570d38db72394491aab0f36570) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* indeo: Properly forward the error codesLuca Barbato2013-07-041-2/+10
| | | | | | | | | | | If the tile data size does not match the buffer size it did not return an AVERROR_INVALIDDATA causing futher corruption later. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 7388c0c58601477db076e2e74e8b11f8a644384a) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* mjpeg: Check the unescaped size for overflowsLuca Barbato2013-06-301-3/+8
| | | | | | | | | | | | | | And contextually check init_get_bits success and fix the reporting message. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 6765ee7b9cba46818a45b051438b2552f0a1b70a) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavcodec/mjpegdec.c
* wmapro: error out on impossible scale factor offsetsLuca Barbato2013-06-301-1/+2
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 02ec656af72030eea4f3d63e30b25625cce6a3df) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* wmapro: check the min_samples_per_subframeLuca Barbato2013-06-301-0/+7
| | | | | | | | | | Must be at least WMAPRO_BLOCK_MIN_SIZE. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit d4a217a408da4bd63acc02cd8f9ebe378a2ad65a) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* wmapro: return early on unsupported conditionLuca Barbato2013-06-301-0/+1
| | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 6652338f43ef623045912d7f28b61adea05d27ae) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavcodec/wmaprodec.c
* wmapro: check num_vec_coeffs against the actual available bufferLuca Barbato2013-06-301-3/+4
| | | | | | | | | | Prevent yet another buffer overwrite. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 38229362529ed1619d8ebcc81ecde85b23b45895) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* wmapro: make sure there is room to store the current packetLuca Barbato2013-06-301-0/+8
| | | | | | | | | | Prevent horrid and hard to trace struct overwrite. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit e30b068ef79f604ff439418da07f7e2efd01d4ea) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* lavc: move put_bits_left in put_bits.hLuca Barbato2013-06-302-5/+8
| | | | | | (cherry picked from commit afe03092dd693d025d43e1620283d8d285c92772) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* 4xm: do not overread the source buffer in decode_p_blockLuca Barbato2013-06-301-0/+8
| | | | | | | | | | Check for out of picture macroblocks before calling mcdc. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 94aefb1932be882fd93f66cf790ceb19ff575c19) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* 4xm: check bitstream_size boundary before using itLuca Barbato2013-06-301-1/+3
| | | | | | | | | | Prevent buffer overread. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 59d7bb99b6a963b7e11c637228b2203adf535eee) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* Prepare for 9.8 RELEASEReinhard Tartler2013-06-301-1/+1
|
* update ChangelogReinhard Tartler2013-06-161-0/+23
|
* smacker: check frame size validityKostya Shishkov2013-06-161-1/+5
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 07423ad7836325e03894f2f87ba46a531a1cc0b3) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* smacker: pad the extradata allocationKostya Shishkov2013-06-161-1/+2
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 4c22baf65363433f8c20efd1022b4ba2d8cf2288) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* smacker: check the return value of smacker_decode_treeKostya Shishkov2013-06-161-1/+10
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit a2f9937bb04b23a341b0ec0eb1d923bbeb420277) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* smacker: fix an off by one in huff.length computationKostya Shishkov2013-06-161-1/+1
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit ee205588b250fe5cae0681be8eba51a5403c3272) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* 4xm: do not overread the prestream bufferLuca Barbato2013-06-161-2/+11
| | | | | | | | 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-06-161-4/+17
| | | | | | | | 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>
* 4xm: reject frames not compatible with the declared versionLuca Barbato2013-06-161-0/+3
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 145023f57262d21474e35b4a6069cf95136339d4) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* 4xm: drop pointless assertLuca Barbato2013-06-161-2/+2
| | | | | | | Make sure the value of wlog2 is always between 0 and 3. (cherry picked from commit 1f0c6075604c271d5627480f1243d22795f9a315) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* 4xm: forward errors from decode_p_blockLuca Barbato2013-06-161-12/+22
| | | | | | | | | | Partially mitigate out of memory writes. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit b8b809908ec547b2609dbac24194f4fd2df61aea) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* 4xm: fold last_picture lazy allocation in decode_p_frameLuca Barbato2013-06-161-8/+10
| | | | | | | | | (cherry picked from commit 50ec1db62d977b6e864f315a53c1c580a6d7efa4) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/4xm.c
* 4xm: do not overread while parsing headerLuca Barbato2013-06-161-6/+14
| | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org (cherry picked from commit 42d73f7f6bea0ee0f64a3ad4882860ce5b923a11) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* 4xm: refactor fourxm_read_headerLuca Barbato2013-06-161-89/+101
| | | | | | | | | | Split sound and video tag parsing in separate functions. (cherry picked from commit e7a44f87d07655ec0cd31c315936931674434340) Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Conflicts: libavcodec/4xm.c
* 4xm: K&R formatting cosmeticsLuca Barbato2013-06-161-44/+41
| | | | | | (cherry picked from commit e6496ea7e7ea7355167a1ccbe67a7199d446a654) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>