aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-304-38/+112
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: drop ff_h264_ prefix from static function ff_h264_decode_rbsp_trailing() h264: Make ff_h264_decode_end() static, it is not used externally. output-example: K&R formatting cosmetics, comment spelling fixes avf: make the example output the proper message avf: fix audio writing in the output-example mov: don't overwrite existing indexes. lzw: fix potential integer overflow. truemotion: forbid invalid VLC bitsizes and token values. truemotion2: handle out-of-frame motion vectors through edge extension. configure: Check for a different SDL function Conflicts: configure doc/examples/muxing.c libavcodec/truemotion2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: drop ff_h264_ prefix from static function ff_h264_decode_rbsp_trailing()Diego Biurrun2012-03-301-2/+2
| |
| * h264: Make ff_h264_decode_end() static, it is not used externally.Diego Biurrun2012-03-302-4/+3
| | | | | | | | Also drop the now unnecessary ff_ prefix from its name.
| * lzw: fix potential integer overflow.Ronald S. Bultje2012-03-291-1/+1
| |
| * truemotion: forbid invalid VLC bitsizes and token values.Ronald S. Bultje2012-03-291-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | SHOW_UBITS() is only defined up to n_bits is 25, therefore forbid values larger than this in get_vlc2() (max_bits). tokens[][] can be used as an index in deltas[], which has a size of 64, so ensure the values are smaller than that. This prevents crashes on corrupt bitstreams. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * truemotion2: handle out-of-frame motion vectors through edge extension.Ronald S. Bultje2012-03-291-27/+90
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | svq3: Fix pointer type mismatch warning.Michael Niedermayer2012-03-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cavsdec: initialize all tables to zeros.Michael Niedermayer2012-03-301-9/+9
| | | | | | | | | | | | | | This ensures that they dont contain invalid values. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | svq1enc: fix ptr type mismatch warningMichael Niedermayer2012-03-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeghaudiodec: Fix "set but not used" warningsMichael Niedermayer2012-03-301-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: Fix "assignment from incompatible pointer type" warningsMichael Niedermayer2012-03-301-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2kenc: Fix "function declaration isn’t a prototype" warningMichael Niedermayer2012-03-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2kdec: fix format stringsMichael Niedermayer2012-03-301-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | interplayvideodec: pass correct pointer to av_dlog()Michael Niedermayer2012-03-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dvbsubdec: Fix "set but not used" warningMichael Niedermayer2012-03-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cavsdec: ensure the tables have been allocated before using themMichael Niedermayer2012-03-301-0/+2
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-304-35/+40
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mp3dec: perform I/S and M/S only when frame mode is joint stereo. id3v2: add another mimetype for JPEG image lzw: prevent buffer overreads. WMAL: Remove inaccurate and unnecessary doxy h264: fix cabac-on-stack after safe cabac reader. truemotion2: convert packet header reading to bytestream2. Conflicts: libavcodec/lzw.c libavcodec/truemotion2.c libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mp3dec: perform I/S and M/S only when frame mode is joint stereo.Kostya Shishkov2012-03-291-1/+1
| | | | | | | | | | | | Looks like some LAME versions produce dual stereo mode MP3s with flags for intensity and middle stereo set. In this mode those flags should be ignored like the reference decoder and derived ones do.
| * lzw: prevent buffer overreads.Ronald S. Bultje2012-03-281-3/+8
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * WMAL: Remove inaccurate and unnecessary doxyMashiat Sarker Shakkhar2012-03-291-8/+0
| | | | | | | | | | | | | | | | A call to decode_packet() does not always decode a complete WMA packet. Moreover, this is not the correct place to document calls that are part of the public API. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * h264: fix cabac-on-stack after safe cabac reader.Ronald S. Bultje2012-03-281-0/+1
| |
| * truemotion2: convert packet header reading to bytestream2.Ronald S. Bultje2012-03-281-23/+31
| | | | | | | | | | | | | | | | Also use correct buffer sizes in calls to tm2_read_stream(). Together, this prevents overreads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Do not try to use lowres for unusual jpg subsampling.Carl Eugen Hoyos2012-03-291-0/+4
| | | | | | | | Fixes ticket #1144.
* | Revert "Fix compilation with hardcoded tables."Carl Eugen Hoyos2012-03-291-1/+0
| | | | | | | | This reverts commit b17b2963692f5f7c19a2188e61922e00680c5fb4.
* | iff: prevent a possible crash with broken/prepared IFF PBMPiotr Bandurski2012-03-291-1/+4
| | | | | | | | | | | | Based on fix by Peter Ross for ticket #1054. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge git://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-EncoderMichael Niedermayer2012-03-291-1/+1
|\ \ | | | | | | | | | | | | | | | | | | * git://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder: Fixes ticket 1127. I'm still looking into why bpp is getting set to 0. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Fixes ticket 1127.Michael Bradshaw2012-03-281-1/+1
| | | | | | | | | | | | I'm still looking into why bpp is getting set to 0.
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-2939-251/+230
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: asf: only set index_read if the index contained entries. cabac: add overread protection to BRANCHLESS_GET_CABAC(). cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC(). cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE(). cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC(). h264: add overread protection to get_cabac_bypass_sign_x86(). h264: reindent get_cabac_bypass_sign_x86(). h264: use struct offsets in get_cabac_bypass_sign_x86(). h264: fix overreads in cabac reader. wmall: fix seeking. lagarith: fix buffer overreads. dvdec: drop unnecessary dv_tablegen.h #include build: fix doc generation errors in parallel builds Replace memset(0) by zero initializations. faandct: Remove FAAN_POSTSCALE define and related code. dvenc: print allowed profiles if the video doesn't conform to any of them. avcodec_encode_{audio,video}: only reallocate output packet when it has non-zero size. FATE: add a test for vp8 with changing frame size. fate: add kgv1 fate test. oggdec: calculate correct timestamps in Ogg/FLAC Conflicts: libavcodec/4xm.c libavcodec/cook.c libavcodec/dvdata.c libavcodec/dvdsubdec.c libavcodec/lagarith.c libavcodec/lagarithrac.c libavcodec/utils.c tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cabac: add overread protection to BRANCHLESS_GET_CABAC().Ronald S. Bultje2012-03-282-11/+22
| | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
| * cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC().Ronald S. Bultje2012-03-281-12/+12
| |
| * cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE().Ronald S. Bultje2012-03-281-3/+3
| |
| * cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC().Ronald S. Bultje2012-03-282-20/+22
| |
| * h264: add overread protection to get_cabac_bypass_sign_x86().Ronald S. Bultje2012-03-281-3/+5
| |
| * h264: reindent get_cabac_bypass_sign_x86().Ronald S. Bultje2012-03-281-22/+22
| |
| * h264: use struct offsets in get_cabac_bypass_sign_x86().Ronald S. Bultje2012-03-281-8/+11
| |
| * h264: fix overreads in cabac reader.Ronald S. Bultje2012-03-281-2/+4
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * wmall: fix seeking.Ronald S. Bultje2012-03-281-0/+13
| |
| * lagarith: fix buffer overreads.Ronald S. Bultje2012-03-282-25/+54
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * dvdec: drop unnecessary dv_tablegen.h #includeDiego Biurrun2012-03-281-1/+0
| | | | | | | | | | dvdec.c uses nothing from dv_tablegen.h. As a welcome side-effect, this fixes compilation of that file with hardcoded tables enabled.
| * Replace memset(0) by zero initializations.Diego Biurrun2012-03-2825-104/+47
| | | | | | | | Also remove one pointless zero initialization in rangecoder.c.
| * faandct: Remove FAAN_POSTSCALE define and related code.Diego Biurrun2012-03-284-50/+22
| | | | | | | | It is not a user-accessible option and unlikely to ever be changed.
| * dvenc: print allowed profiles if the video doesn't conform to any of them.Anton Khirnov2012-03-283-2/+21
| |
| * avcodec_encode_{audio,video}: only reallocate output packet when it has ↵Anton Khirnov2012-03-281-2/+2
| | | | | | | | | | | | | | non-zero size. Otherwise realloc would free it, which would result in double free later.
* | indeo4: Dont leave tables in random state on errors.Michael Niedermayer2012-03-281-2/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | indeo4: apply correction to eob/esc indexes tooMichael Niedermayer2012-03-281-0/+8
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | indeo4: Check for mismatching scan tablesMichael Niedermayer2012-03-281-0/+4
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: Fix global array overread.Michael Niedermayer2012-03-281-2/+2
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | apedec: fix global array overreadMichael Niedermayer2012-03-281-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | apedec: check bits <= 32Michael Niedermayer2012-03-281-1/+4
| | | | | | | | | | | | | | Fixes FPE Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tm2dec: check total_frames and extradata_size.Michael Niedermayer2012-03-281-1/+4
| | | | | | | | | | | | | | Fixes overread Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>