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-08-05avcodec/vorbisdec: Implement vr->classifications = 1Michael Niedermayer
It appears no valid file uses this, so this is not testable with a valid file. Fixes: assertion failure Fixes: 16187/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VORBIS_fuzzer-5638880618872832 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 5a5f12e3b3f2177ede5839ff4141228666b8436f) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-08-05avcodec/vorbisdec: Check parameters in vorbis_floor0_decode() before divideMichael Niedermayer
Fixes: division by zero Fixes: 16183/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VORBIS_fuzzer-5688966782648320 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit aecc9b96d613f54d772e9475738bb54e0e1f182e) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-07-21avcodec/vorbisdec: Check vlc for floor0 dec vector offsetMichael Niedermayer
Fixes: out of array access Fixes: 15649/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VORBIS_fuzzer-5729191309344768 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-07-21avcodec/vorbisdec: amplitude bits can be more than 25 bitsMichael Niedermayer
Fixes: assertion failure, invalid shift Fixes: 15583/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VORBIS_fuzzer-5640157484548096 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-03-07lavc/vorbisdec: Allow avcodec_open2 to call .closeMatt Wolenetz
If there is a decoder initialization failure detected in avcodec_open2 after .init is called, allow graceful decoder .close to prevent leaking vorbis decoder allocations such as those from vorbis_parse_setup_*. BUG=772699 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-05avcodec/vorbisdec: add missing commaJames Almer
Should fix compilation failures after 191b2d4fc96fa87975a8eb5d87db04516b8a04c3. Found-by: philipl
2017-05-05Merge commit '0b77a5933635293508e7289e7cf191ed166cf070'James Almer
* commit '0b77a5933635293508e7289e7cf191ed166cf070': Use correct printf conversion specifiers for POSIX integer types See 549045254c4614d5d61b5c36e340171a6914d57c Merged-by: James Almer <jamrial@gmail.com>
2017-03-29Fix all -Wformat warnings raised by DJGPPClément Bœsch
2016-12-23Use correct printf conversion specifiers for POSIX integer typesDiego Biurrun
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-01-04vorbisdec: reject rangebits 0 with non-0 partitionsAndreas Cadhalpun
This causes non-unique elements in floor_setup->data.t1.list, which makes the stream undecodable according to the specification. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2016-01-04vorbisdec: reject channel mapping with less than two channelsAndreas Cadhalpun
It causes the angle channel number to equal the magnitude channel number, which makes the stream undecodable according to the specification. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-09-03avcodec/vorbisdec: use init_get_bits8()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@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-27Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.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-07-27lavc: AV-prefix all codec flagsVittorio Giovara
Convert doxygen to multiline and 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-08Merge commit '0025f7408a0fab2cab4a950064e4784a67463994'Michael Niedermayer
* commit '0025f7408a0fab2cab4a950064e4784a67463994': vorbis: Check the vlc value in setup_classifs Conflicts: libavcodec/vorbisdec.c See: ae038c0914460646503be083e30e3971093239a1 See: 709cae2bcbc0ea2c5d46c932b3d8301cf8f98e6b Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-08Merge commit '62de77ffcaebd42fe685b8426da56b89b2532318'Michael Niedermayer
* commit '62de77ffcaebd42fe685b8426da56b89b2532318': vorbis: Use a local codebook variable Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-08vorbis: Check the vlc value in setup_classifsLuca Barbato
The valid returned values are always at most 11bit. Remove the previous check that assumed larger values plausible and use a signed integer to check get_vlc2 return values. CC: libav-stable@libav.org
2015-03-08vorbis: Use a local codebook variableLuca Barbato
Makes the code a little simpler.
2015-03-01Merge commit 'ee964145b5d229571e00bf6883a44189d02babe2'Michael Niedermayer
* commit 'ee964145b5d229571e00bf6883a44189d02babe2': lavc: remove unused traces of fmtconvert usage Conflicts: libavcodec/aac.h libavcodec/aacdec.c libavcodec/atrac3.c libavcodec/vorbisdec.c libavcodec/wma.c libavcodec/wma.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28lavc: remove unused traces of fmtconvert usageAnton Khirnov
Those decoders have been switched to float output and so do not use fmtconvert anymore.
2015-02-22avcodec/vorbisdec: Fix memleak, call cleanup on memory allocation failureMichael Niedermayer
Fixes CID1258478, CID1258476, CID1258475 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-18Merge commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46'Michael Niedermayer
* commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46': vorbisdec: Check memory allocations Conflicts: libavcodec/vorbisdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17vorbisdec: Check memory allocationsVittorio Giovara
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-12-14avcodec/xiph: mark returned header pointers const from ↵Michael Niedermayer
avpriv_split_xiph_headers() Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-01avcodec/vorbisdec: Use avpriv_float_dsp_alloc()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-08avcodec/vorbisdec: use av_freep(), do not leave stale pointers in memoryMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-04avcodec/vorbisdec: Fix off by 1 error in ptns_to_readMichael Niedermayer
Fixes read of uninitialized memory Fixes: asan_heap-uaf_18dac2b_9_asan_heap-uaf_22eb375_208_beta3_test_small.ogg Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07avcodec/vorbisdec: Reset first_frameMichael Niedermayer
This avoids returning a initial frame after seeking which does not match what would be received when decoding from the begin. Suggested-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-30avcodec/vorbisdec: use av_malloc(z)_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-30avcodec/vorbisdec: try to workaround libvorbisenc bugMichael Niedermayer
Fixes Ticket3590 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11avcodec/vorbisdec: use the stored previous window type only when the actual ↵Michael Niedermayer
previous is not known Fixes Ticket3432 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-01vorbisdec: Check VLC tables during use instead of setupMichael Niedermayer
Fixes regression and Ticket2720 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-01vorbisdec: propagate errors from setup_classifs()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-08Merge commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1'Michael Niedermayer
* commit 'f8a4d5e970f32f8cc747f9fa7bd975ee4a060ea1': h264_parser: K&R formatting cosmetics vorbis: return meaningful errors Conflicts: libavcodec/h264_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-07vorbis: return meaningful errorsLuca Barbato
2013-05-20Merge commit 'db347280eb3746d7b70888db97f1efe5f06f5624'Michael Niedermayer
* commit 'db347280eb3746d7b70888db97f1efe5f06f5624': vorbis: fallback to normal division instead of crashing Conflicts: libavcodec/vorbisdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20Merge commit 'ddf1b4a2f8a680126eb611428e4f47e6e5b8c6c0'Michael Niedermayer
* commit 'ddf1b4a2f8a680126eb611428e4f47e6e5b8c6c0': vorbis: simplify the inner loop in setup_classifs Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20Merge commit '36f10380043c8b8c5cbf8c1add8695089cdaa341'Michael Niedermayer
* commit '36f10380043c8b8c5cbf8c1add8695089cdaa341': vorbis: use normal integer values for iterators Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20Merge commit '98186578a2a21af5bfe6dd71d222dc270f763c7d'Michael Niedermayer
* commit '98186578a2a21af5bfe6dd71d222dc270f763c7d': vorbis: refactor vorbis_residue_decode_internal Conflicts: libavcodec/vorbisdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-20vorbis: fallback to normal division instead of crashingLuca Barbato
The use of ff_inverse speeds up slightly arches + compilers that do not provide a division faster than the whole machinery, such as ppc32 + gcc4.7, but has operational limits. Drop the always-enable assert and provide a fallback.