summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
...
| * pcx: round up in bits->bytes conversion in a buffer size checkAnton Khirnov2013-11-21
| | | | | | | | | | | | Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | Merge commit 'c918e08b9cc9ce8d06159c51da55ec5ab018039a'Michael Niedermayer2013-11-22
|\| | | | | | | | | | | | | | | * commit 'c918e08b9cc9ce8d06159c51da55ec5ab018039a': truemotion1: make sure index does not go out of bounds See: fd4c1c0b70b5a06dd572d7e27799a2f4c3d9b984 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * truemotion1: make sure index does not go out of boundsAnton Khirnov2013-11-21
| | | | | | | | | | | | Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | Merge commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0'Michael Niedermayer2013-11-22
|\| | | | | | | | | | | | | | | | | | | * commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0': vc1: fix a memleak. Conflicts: libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: fix a memleak.Anton Khirnov2013-11-21
| | | | | | | | | | | | | | Happens on a B-frame when neither low_delay nor last_picture_ptr is set (probably corrupted streams only). Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * motionpixels: clip VLC codes.Anton Khirnov2013-11-21
| | | | | | | | | | | | Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | Merge commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c'Michael Niedermayer2013-11-22
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f0259a587ee3419dd894873ea617b4c98eeaca1c': h264: check buffer size before accessing it Conflicts: libavcodec/h264.c See: ea0ac11e52b9cf5264f3d4eb7543e760c2a5fbb4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: check buffer size before accessing itAnton Khirnov2013-11-21
| | | | | | | | | | | | Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | Merge commit '1f3e56b6dcc163a705704e98569d4850a31d651c'Michael Niedermayer2013-11-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '1f3e56b6dcc163a705704e98569d4850a31d651c': gifdec: convert to bytestream2 Conflicts: libavcodec/gifdec.c libavcodec/lzw.c libavcodec/lzw.h See: 3fd60d804996031ceaba9cad0b38652b92551eb0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * gifdec: convert to bytestream2Anton Khirnov2013-11-21
| |
* | avcodec/gifdec: print error if image is not within dimensionsMichael Niedermayer2013-11-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c453723ad7d14abc5e82677eebaa6025fa598f08'Michael Niedermayer2013-11-22
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c453723ad7d14abc5e82677eebaa6025fa598f08': gifdec: check that the image dimensions are non-zero Conflicts: libavcodec/gifdec.c See: 286930d302fd34cfc2541bfdd760a8bbf9f2d2e5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * gifdec: check that the image dimensions are non-zeroAnton Khirnov2013-11-21
| | | | | | | | | | | | | | Also add an error message an return a more suitable error code (INVALIDDATA, not EINVAL); Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | Merge commit '074c769de93bf12e9f44d77e58a8c7167f9dfb13'Michael Niedermayer2013-11-22
|\| | | | | | | | | | | | | | | | | * commit '074c769de93bf12e9f44d77e58a8c7167f9dfb13': h264_cavlc: check the size of the intra PCM data. This check is redundant, but does no harm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264_cavlc: check the size of the intra PCM data.Anton Khirnov2013-11-21
| | | | | | | | | | | | Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | hevc : add hevc profilegcocherel2013-11-22
| | | | | | | | | | | | (cherry picked from commit 0c8dfd8ad6400b33da55a9f4d9aa8d3f5c9d209f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc : update hevc_ps.cgcocherel2013-11-22
| | | | | | | | | | | | (cherry picked from commit 088f2eb1ae42bffc63c2cee4e7eba8f47056043b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/x86/vp9dsp: merge a few SWAP together.Clément Bœsch2013-11-21
| |
* | hevc : update hls_decode_neighbour(cherry picked from commit ↵gcocherel2013-11-21
| | | | | | | | | | | | 14341c6d9a6885657ba365807223e96a67d6c0ed) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc : fix pcm(cherry picked from commit ↵gcocherel2013-11-21
| | | | | | | | | | | | 12bbfdba1899d11044d2bd8457159fc8b4b52a76) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dct/fft: Give consistent names to fixed/float template files Conflicts: libavcodec/fft_fixed.c libavcodec/fft_float.c libavcodec/mdct_fixed.c libavcodec/mdct_float.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dct/fft: Give consistent names to fixed/float template filesDiego Biurrun2013-11-21
| |
| * mpeg4videoenc: restore macro parenthesesVittorio Giovara2013-11-21
| | | | | | | | These were erroneously removed in 8769113accf1f3b78634dec60b37f7354ed6d88d.
| * libxavs: rename and fix a variable nameSean McGovern2013-11-20
| | | | | | | | | | | | It was mis-spelled in b18c7c8d3ddfbf171fe0aba1c201a002920af7f7. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge branch 'master' of https://github.com/upsuper/ffmpeg-vdadecMichael Niedermayer2013-11-21
|\ \ | | | | | | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | vda_h264_dec: backup context before overridingXidorn Quan2013-11-20
| | | | | | | | | | | | | | | | | | Some of context fields which must be overrided by this wrapper decoder may be set and used by user, so we have to save and restore them before and after invoking the inner decoder to secure user.
* | | avcodec/utils: remove unused variableMichael Niedermayer2013-11-21
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec: move end zeroing code from av_packet_split_side_data() to ↵Michael Niedermayer2013-11-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avcodec_decode_subtitle2() This code changes the input packet, which is read only and can in rare circumstances lead to decoder errors. (i run into one of these in the audio decoder, which corrupted the packet during av_find_stream_info() so that actual decoding that single packet failed later) Until a better fix is implemented, this commit limits the problem. A better fix might be to make the subtitle decoders not depend on data[size] = 0 or to copy their input when this is not the case.
* | | avcodec/avpacket: fix order of operations in case of too large allocationMichael Niedermayer2013-11-20
| | | | | | | | | | | | | | | Found-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/utils: use the unpack_dictionary functionBen Boeckel2013-11-20
| | | | | | | | | | | | | | | Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/avpacket: use size_t, fix potential integer overflowMichael Niedermayer2013-11-20
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Document new APIs for av_packet_{un, }pack_dictionary()Ben Boeckel2013-11-20
| | | | | | | | | | | | | | | | | | Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Reveiwed-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avpacket: add pack/unpack functions for AVDictionaryBen Boeckel2013-11-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | These functions are intended for use with side_data which comes in an AVPacket. Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Reviewed-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec: add side_data type for updated metadataBen Boeckel2013-11-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | This type is intended to be used to allow codecs to pass updated metadata to applications. Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Reviewed-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/h261enc: dont use current_mv_x/yMichael Niedermayer2013-11-20
| | | | | | | | | | | | | | | | | | | | | Fixes -mbd rd Fixes Ticket3151 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avcodec/h261enc: avoid use of current/previous_mbaMichael Niedermayer2013-11-20
| | | | | | | | | | | | | | | | | | Fixes part of Ticket3151 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge commit 'ffb0af7f17eb0da86e9b140e86a1404d3c6c9e79'Michael Niedermayer2013-11-20
|\ \ \ | |/ / |/| / | |/ | | | | | | * commit 'ffb0af7f17eb0da86e9b140e86a1404d3c6c9e79': ac3dec: simplify an expression Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ac3dec: simplify an expressionTim Walker2013-11-19
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avcodec/avpacket: correctly set the number of side data elements in ↵Michael Niedermayer2013-11-20
| | | | | | | | | | | | av_copy_packet_side_data() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-19
|\| | | | | | | | | | | | | * qatar/master: dv_tablegen: Remove CONFIG_SMALL preprocessor check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dv_tablegen: Remove CONFIG_SMALL preprocessor checkDiego Biurrun2013-11-19
| | | | | | | | The code does in no way depend on CONFIG_SMALL.
* | Merge commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da'Michael Niedermayer2013-11-19
|\| | | | | | | | | | | | | * commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da': avcodec.h: include version.h before using version macro Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec.h: include version.h before using version macroVittorio Giovara2013-11-19
| |
* | Merge commit 'c673fc919c374c60b1e6d80d8822712eadf67f16'Michael Niedermayer2013-11-19
|\| | | | | | | | | | | | | | | | | | | * commit 'c673fc919c374c60b1e6d80d8822712eadf67f16': hevc_sei: drop unused parameter Conflicts: libavcodec/hevc_sei.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc_sei: drop unused parameterVittorio Giovara2013-11-19
| |
* | Merge commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e'Michael Niedermayer2013-11-19
|\| | | | | | | | | | | | | | | | | | | * commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e': mpeg4videodec: K&R formatting cosmetics Conflicts: libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videodec: K&R formatting cosmeticsVittorio Giovara2013-11-19
| |
* | Merge commit '8769113accf1f3b78634dec60b37f7354ed6d88d'Michael Niedermayer2013-11-19
|\| | | | | | | | | | | | | | | | | | | * commit '8769113accf1f3b78634dec60b37f7354ed6d88d': mpeg4videoenc: K&R formatting cosmetics Conflicts: libavcodec/mpeg4videoenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4videoenc: K&R formatting cosmeticsVittorio Giovara2013-11-19
| |
| * mpegvideo: Fix swapping of UV planes for VCR2Kostya Shishkov2013-11-19
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-16 05:52:54 +0000