Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-09-03avcodec/indeo4: Check dimensions in decode_pic_hdr()Michael Niedermayer
Fixes: Timeout Fixes: 9654/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INDEO4_fuzzer-6289863463665664 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-07-04avcodec/indeo4: Check for end of bitstream in decode_mb_info()Michael Niedermayer
Fixes: Timeout Fixes: 8776/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INDEO4_fuzzer-5361788798369792 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-05-26indeo4: Decode all or nothing of a band header.Michael Niedermayer
This avoids inconsistent value combinations. Alternatively it would be possible to add more checks and careful use of temporary variables, but my try of this quickly seemed to become a rather large change. The disadvantage of this, is that the struct is copied back and forth. Fixes: index 6 out of bounds for type 'const uint16_t [5][16]' Fixes: 6557/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INDEO4_fuzzer-4787296550256640 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-07-12avcodec/ivi: Use av_image_check_size2()Michael Niedermayer
Fixes OOM Fixes: 1514/clusterfuzz-testcase-minimized-6437666243477504 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-06-08avcodec/indeo4: Check remaining data in Pic hdr extension parsing codeMichael Niedermayer
Fixes: Timeout Fixes: 2115/clusterfuzz-testcase-minimized-6594111748440064 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-29Merge commit 'b668662939de3a02454cfc9ba3e6d10b87527a40'Clément Bœsch
* commit 'b668662939de3a02454cfc9ba3e6d10b87527a40': get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes The merge commit also includes changes for libavcodec/interplayacm.c and libavcodec/truemotion2rt.c Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-07get_bits: Move BITSTREAM_READER_LE definition before all relevant #includesDiego Biurrun
This avoids the danger that get_bits.h might get indirectly #included before BITSTREAM_READER_LE is defined. Also sort headers into canonical order where appropriate.
2016-04-17Merge commit '64250d94b74d3fd47cc8b1611f48daf6a6ed804a'Derek Buitenhuis
* commit '64250d94b74d3fd47cc8b1611f48daf6a6ed804a': indeo4: Consistently initialize variables Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721'Derek Buitenhuis
* commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721': indeo4: Rework stream analysis report Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-03-22indeo4: Consistently initialize variablesVittorio Giovara
Avoid using multiple variables for the same purpose.
2016-03-22indeo4: Rework stream analysis reportVittorio Giovara
* Change log level from error to debug * Print report after the first decoded frame, not at the end of decoding * Drop macro guard and use a context variable instead Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer
* commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27lavc: AV-prefix all codec capabilitiesVittorio Giovara
Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-20Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'Michael Niedermayer
* commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25': lavc: Replace av_dlog and tprintf with internal macros Conflicts: libavcodec/aacdec.c libavcodec/audio_frame_queue.c libavcodec/bitstream.c libavcodec/dcadec.c libavcodec/dnxhddec.c libavcodec/dvbsubdec.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/get_bits.h libavcodec/gifdec.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/imc.c libavcodec/interplayvideo.c libavcodec/jpeglsdec.c libavcodec/libopencore-amr.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_parser.c libavcodec/pngdec.c libavcodec/ratecontrol.c libavcodec/rv10.c libavcodec/svq1dec.c libavcodec/vqavideo.c libavcodec/wmadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-19lavc: Replace av_dlog and tprintf with internal macrosVittorio Giovara
2015-03-30Merge commit '23944d29a22a2cd602753b3705f73011c3bf0b18'Michael Niedermayer
* commit '23944d29a22a2cd602753b3705f73011c3bf0b18': indeo: Give Indeo4/5 shared code a more consistent name Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30indeo: Give Indeo4/5 shared code a more consistent nameDiego Biurrun
2014-06-27Merge commit '5ec6d152e26c570c0a16ec72c1f354db95708179'Michael Niedermayer
* commit '5ec6d152e26c570c0a16ec72c1f354db95708179': indeo4: B-frames decoding Conflicts: libavcodec/ivi_common.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-26indeo4: B-frames decodingDirk Ausserhaus
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2014-06-23Merge commit 'e121ac634ba324a318f4a97f978dcfb48da6b735'Michael Niedermayer
* commit 'e121ac634ba324a318f4a97f978dcfb48da6b735': indeo45: use is_indeo4 context flag instead of checking codec ID Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-23indeo45: use is_indeo4 context flag instead of checking codec IDDirk Ausserhaus
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2014-06-01Decode both parts of Indeo4 IP framesDirk Ausserhaus
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2014-06-01Move Indeo4 frametypes into common header.Dirk Ausserhaus
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2014-05-30avcodec/indeo4: Decode both parts of IP framesDirk Ausserhaus
Fixes part of Ticket845 av_frame_move_ref() idea by Anton Khirnov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30avcodec/indeo4: Move frametypes into common header.Dirk Ausserhaus
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-25Revert "Merge remote-tracking branch 'qatar/master'" ↵Michael Niedermayer
(43dec5ef9a360c9ffac3278f464832bd99af0cb0) Fixes out of array accesses Fixes asan_static-oob_eb9812_5961_iv41.avi This reverts the merge of c9ef6b09326a24010bf86d6b0d19cfa42df4d546 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
2013-10-13Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: indeo4: Check the inherited quant_mat Conflicts: libavcodec/indeo4.c See: 884efd4e09696b201457feebdef684aee30be99d Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13Merge commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0'Michael Niedermayer
* commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0': indeo4: Check the block size if reusing the band configuration Conflicts: libavcodec/indeo4.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13indeo4: Check the inherited quant_matLuca Barbato
Invalidate it if not supported. Sample-Id: 00000262-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-10-13indeo4: Check the block size if reusing the band configurationLuca Barbato
Sample-Id: 00000287-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-10-04Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'Michael Niedermayer
* commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2': cosmetics: Group .name and .long_name together in codec/format declarations Conflicts: libavcodec/8svx.c libavcodec/alac.c libavcodec/cljr.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dpxenc.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/ffv1dec.c libavcodec/flacdec.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g726.c libavcodec/gif.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopencore-amr.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/libvo-amrwbenc.c libavcodec/libvorbisenc.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/ljpegenc.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/msmpeg4dec.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/proresdec_lgpl.c libavcodec/proresenc_kostya.c libavcodec/ra144enc.c libavcodec/rawdec.c libavcodec/rv10.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tta.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/wavpack.c libavcodec/xbmenc.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04cosmetics: Group .name and .long_name together in codec/format declarationsDiego Biurrun
2013-08-30Reinstate proper FFmpeg license for all files.Thilo Borgmann
2013-07-15Merge commit '28dda8a691f1c723a4a9365ab85f9625f1330096'Michael Niedermayer
* commit '28dda8a691f1c723a4a9365ab85f9625f1330096': indeo: Sanitize ff_ivi_init_planes fail paths Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15indeo: Sanitize ff_ivi_init_planes fail pathsLuca Barbato
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-07-14indeo4: print an error message if ref_mb is needed but unavailableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14indeo: print errors if transform and block size mismatchMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: indeo: Bound-check before applying transform Conflicts: libavcodec/indeo4.c libavcodec/indeo5.c libavcodec/ivi_common.c See: af388237093ed6df6f5118b34ef938a2ca2ffbda, 0846719dd11ab3f7a7caee13e7af71f71d913389 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14Merge commit 'cd78e934c246d1b2510f8fba0abfe40bb75795f6'Michael Niedermayer
* commit 'cd78e934c246d1b2510f8fba0abfe40bb75795f6': indeo4: Validate scantable dimension See: 92f7f1db421ee8b3431534fa09e8050ba622c33a Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14Merge commit '6255ccf7d51c82ab79bf0cd47a921f572dda4489'Michael Niedermayer
* commit '6255ccf7d51c82ab79bf0cd47a921f572dda4489': indeo4: Check the quantization matrix index Conflicts: libavcodec/indeo4.c See: 8a20774a24bb1ea68b7360113746eac6e59ad8a8 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14Merge commit '8435bca087c0e79385763c51de009fd89390b6a5'Michael Niedermayer
* commit '8435bca087c0e79385763c51de009fd89390b6a5': indeo4: Do not access missing reference MV Conflicts: libavcodec/indeo4.c See: 5216245a, aae44fb4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-13indeo: Bound-check before applying transformLuca Barbato
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-07-13indeo4: Validate scantable dimensionLuca Barbato
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-07-13indeo4: Check the quantization matrix indexLuca Barbato
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-07-13indeo4: Do not access missing reference MVLuca Barbato
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-05-29Merge commit '4a27a52a1f74016095b7aee1b4a422cf62217ade'Michael Niedermayer
* commit '4a27a52a1f74016095b7aee1b4a422cf62217ade': fate: Don't use files from SRC_PATH in the actual tests indeo4: reuse context block VLC for band instead of defaulting Conflicts: tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-29Merge commit '6647aa0426e73839b9b1d1c9d86188f469167531'Michael Niedermayer
* commit '6647aa0426e73839b9b1d1c9d86188f469167531': indeo4: add missing Haar and slanted transforms dxtory v2 support Conflicts: libavcodec/indeo4.c libavcodec/ivi_dsp.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28indeo4: reuse context block VLC for band instead of defaultingKostya Shishkov
Currently if no custom block VLC is specified for band, a default block VLC will be used, while the global block VLC stored in the context should be used instead. This fixes decoding of one sample I have.
2013-05-28indeo4: add missing Haar and slanted transformsKostya Shishkov
That involves fixing INV_HAAR4() macro and changing it to work with different input and output like INV_HAAR8() instead of in-place transform.
2013-04-22indeo4: implement haar 8x1 and 1x8 transformsMichael Niedermayer
Fixes Ticket1984 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>