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
2019-07-14avcodec/iff: Add "else" to make code look prettierMichael Niedermayer
Reviewed-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-07-08avcodec/iff: Check ham vs bppMichael Niedermayer
This checks the ham value much stricter and avoids hitting cases which cannot be reached with data from the libavformat demuxer. Fixes: out of array access Fixes: 15320/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IFF_ILBM_fuzzer-5080476840099840 Fixes: 15423/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IFF_ILBM_fuzzer-5630765833912320 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-06-23avcodec/iff: finetune the palette size check in the mask caseMichael Niedermayer
Fixes: out of array access Fixes: 15381/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IFF_ILBM_fuzzer-5668057826983936 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-06-23avcodec/iff: Fix mask_buf / mask_palbuf leakMichael Niedermayer
Fixes: 15372/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IFF_ILBM_fuzzer-5708881759567872 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-06-18avcodec/iff: Cleanup on init failureMichael Niedermayer
Fixes: memleak Fixes: 2272/clusterfuzz-testcase-minimized-5059103858622464 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-29Fix all -Wformat warnings raised by DJGPPClément Bœsch
2017-02-12avcodec/iff: support for byterun1 ACBM compressionPaul B Mahol
This is apparently same as no compression. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-01-06avcodec/iff: add support for vertical word compression in ILBMPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-08-15avcodec/iff: remove palette swapping for animPaul B Mahol
It appears it is wrong.
2016-07-11avcodec/iff: Check that there are enough bytes in dgb before readingMichael Niedermayer
Fixes CID1361959 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-07-11avcodec/iff: remove useless ()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-07-06avcodec/iff: Print error for cols/bpp/bytes being bad in decode_delta_j()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-07-06avcodec/iff: decode_delta_j: Check that the number of bytes that will be ↵Michael Niedermayer
read are available This should avoid long loops related to CID1361958 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-21Merge commit '5c31eaa9998b2185e0aa04d11adff128498dc14a'Clément Bœsch
* commit '5c31eaa9998b2185e0aa04d11adff128498dc14a': Remove unnecessary get_bits.h #includes and add missing headers where needed. Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-12avcodec/iff: Fix bytestream advanceMichael Niedermayer
Fixes Ticket5585 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-05-23avcodec/iff: mention RGB8/RGBN decoderPiotr Bandurski
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-05-19avcodec/iff: add support for ANBR filesPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-05-18avcodec/iff: add forgotten checks for end of input bufferPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-05-18avcodec/iff: scala anim32 & anim16 decompressionPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-05-17avcodec/iff: fix artifacts with uncompressed ham ANIMsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-05-16avcodec/iff: add support for ANIMs with keyframes and concatenated ANIMsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-05-16avcodec/iff: check if there is enough bytes leftPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-05-15avcodec/iff: rewrite out of bounds checking in writerPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-05-14avcodec/iff: check for end of buffer in input for delta_l decompressionPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-05-14avcodec/iff: implement 3rd delta ANIM decompressionPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-05-13avcodec/iff: change delta l offset to uint32_tPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-05-13lavc: add IFF ANIM decoderPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-05-04Remove unnecessary get_bits.h #includes and add missing headers where needed.Alexandra Hájková
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-10-12avcodec: remove leftover iff_byterun1 decoderAndreas Cadhalpun
It was merged with the iff_ilbm decoder in commit 929a24efff9a208a52748605eb412ffb915c1403. Define AV_CODEC_ID_IFF_BYTERUN1 as AV_CODEC_ID_IFF_ILBM for API compatibility. Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-07-28Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
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: Consistently prefix input buffer definesVittorio Giovara
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27lavc: AV-prefix all codec capabilitiesVittorio Giovara
Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-02-14Merge commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0'Michael Niedermayer
* commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0': avcodec: Don't anonymously typedef structs Conflicts: libavcodec/alac.c libavcodec/cinepak.c libavcodec/cscd.c libavcodec/dcadec.c libavcodec/g723_1.c libavcodec/gif.c libavcodec/iff.c libavcodec/kgv1dec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/ra288.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-14avcodec: Don't anonymously typedef structsDiego Biurrun
2014-08-11avcodec/iff: check pixfmt for rgb8 / rgbnMichael Niedermayer
Fixes out of array access Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10avcodec/iff: Factorize av_pix_fmt_desc_get() outMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-02avcodec/iff: ensure that runs with insufficient input dont leave ↵Michael Niedermayer
uninitialized bytes in the output Fixes use of uninitialized memory Fixes: msan_uninit-mem_7fa0dea15eae_8988_test.iff Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-20avcodec/iff: warn about truncated input to decode_byterun() and clear ↵Michael Niedermayer
remaining output Fixes use of uninitialized memory Fixes: msan_uninit-mem_7fe205e395ed_8988_test.iff Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun
2013-11-17Merge commit '2e09096da912f563c4dd889a8f25c314529bbaa6'Michael Niedermayer
* commit '2e09096da912f563c4dd889a8f25c314529bbaa6': kgv1: use the AVFrame API properly. indeo2: use the AVFrame API properly. iff: use the AVFrame API properly. msrle: use the AVFrame API properly. Conflicts: libavcodec/iff.c libavcodec/indeo2.c libavcodec/kgv1dec.c libavcodec/msrle.c See: 451b2ca1b4349f9b60416cc057eaf5518d81025c See: 80e9e63c946660304fc65fa8141ccfdbe4d196d1 See: 057dce5f21cd70db1ef6e3b67644a39f0d51aba5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-16iff: use the AVFrame API properly.Anton Khirnov
2013-10-19Do not leave positive values undefined when negative are defined as errorMichael Niedermayer
Define positive return values as non errors and leave further meaning undefined This allows future extensions to use these values Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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-07-11Merge commit '3865ba7b21aef5d60183719e238361ec8797ab5a'Michael Niedermayer
* commit '3865ba7b21aef5d60183719e238361ec8797ab5a': iff: K&R formatting cosmetics Conflicts: libavcodec/iff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10iff: Do not read over the source bufferLuca Barbato
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-07-10iff: K&R formatting cosmeticsLuca Barbato
2013-03-15lavc & lavf: replace deprecated av_log* functionsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>