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
path: root/libavcodec/wmv2dec.c
AgeCommit message (Collapse)Author
2019-05-12avcodec/wmv2dec: Check input bits vs. coded MBsMichael Niedermayer
Fixes: Timeout (94sec ->8sec) Fixes: 14387/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV2_fuzzer-5723546887651328 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2019-04-19avcodec/wmv2dec: Check that the P frame secondary header fit in the inputMichael Niedermayer
Fixes: Timeout (64sec ->2 sec) Fixes: 14131/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV2_fuzzer-5719879556005888 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-12-05avcodec/wmv2dec: Skip I frame if its smaller than 1/8 of the minimal sizeMichael Niedermayer
Frames that small are not valid and of limited use for error concealment, while being very computationally intensive to process. Fixes: Timeout Fixes: 11168/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV2_fuzzer-5733782032744448 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-09-03avcodec/wmv2dec: skip frames that have only skiped MBsMichael Niedermayer
This requires us to pre-parse the skip data, as we want to detect this before allocating all the arrays Fixes: Timeout Fixes: 9708/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV2_fuzzer-5729709861109760 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-18avcodec/wmv2dec: Check end of bitstream in parse_mb_skip() and ↵Michael Niedermayer
ff_wmv2_decode_mb() Fixes: Timeout Fixes: 3200/clusterfuzz-testcase-5750022136135680 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-23Merge commit 'b3739599bda740ac12d3dde31a331b744df99123'James Almer
* commit 'b3739599bda740ac12d3dde31a331b744df99123': lavc: Drop deprecated emu edge functionality Merged-by: James Almer <jamrial@gmail.com>
2016-05-07Merge commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7'Derek Buitenhuis
* commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7': intrax8: Remove mpegvideo dependency Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-07Merge commit '9fa888c02801fff2e8817c24068f5296bbe60000'Derek Buitenhuis
* commit '9fa888c02801fff2e8817c24068f5296bbe60000': intrax8: Keep a reference to the decoder blocks Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-07Merge commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f'Derek Buitenhuis
* commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f': intrax8: Use the generic horizband function Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-07Merge commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b'Derek Buitenhuis
* commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b': intrax8: Pass macroblock coordinates to ff_intrax8_decode_picture Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-07Merge commit 'd0540fd02171a6233d2016b199d013299debf7e3'Derek Buitenhuis
* commit 'd0540fd02171a6233d2016b199d013299debf7e3': intrax8: Pass macroblock size to ff_intrax8_common_init Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24Merge commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3'Derek Buitenhuis
* commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3': intrax8: Reference the current AVCodecContext Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24Merge commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5'Derek Buitenhuis
* commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5': intrax8: Keep a reference to the GetBitContext reader Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24Merge commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64'Derek Buitenhuis
* commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64': intrax8: Pass the output frame to the decoding function Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24Merge commit '577393321c389ad2973bec6168a8045c94a9e099'Derek Buitenhuis
* commit '577393321c389ad2973bec6168a8045c94a9e099': intrax8: Carry over the loopfilter value in ff_intrax8_decode_picture Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-24Merge commit '68127e1bf8037a6e0acd6401cc8c5da950e3fa0a'Derek Buitenhuis
* commit '68127e1bf8037a6e0acd6401cc8c5da950e3fa0a': intrax8: Keep a reference to the context idctdsp Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit 'd909f43b5c773a73c8d526638744547ba4aa8c59'Derek Buitenhuis
* commit 'd909f43b5c773a73c8d526638744547ba4aa8c59': vc1dec: wmv2dec: Validate ff_intrax8_common_init return value Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit '0c6a70873fc6e43194b471d112c30823b6c8d0b4'Derek Buitenhuis
* commit '0c6a70873fc6e43194b471d112c30823b6c8d0b4': intrax8: Move error resilience out of intrax8 Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-03-29intrax8: Remove mpegvideo dependencyVittorio Giovara
2016-03-29intrax8: Keep a reference to the decoder blocksVittorio Giovara
2016-03-29intrax8: Use the generic horizband functionVittorio Giovara
This is assuming that intrax8 has no support for interlacing Carry over lowdelay value in ff_intrax8_decode_picture.
2016-03-29intrax8: Pass macroblock coordinates to ff_intrax8_decode_pictureVittorio Giovara
These values need to be updated with the last macroblock position, so keep them as pointers.
2016-03-29intrax8: Pass macroblock size to ff_intrax8_common_initVittorio Giovara
Helps in decoupling this code from mpegvideo.
2016-03-25intrax8: Reference the current AVCodecContextVittorio Giovara
It will be needed to initialize BlockDSP in the next commit.
2016-03-25intrax8: Keep a reference to the GetBitContext readerVittorio Giovara
Helps in decoupling this code from mpegvideo.
2016-03-25intrax8: Pass the output frame to the decoding functionVittorio Giovara
Helps in decoupling this code from mpegvideo.
2016-03-25intrax8: Carry over the loopfilter value in ff_intrax8_decode_pictureVittorio Giovara
Helps in decoupling this code from mpegvideo.
2016-03-25intrax8: Keep a reference to the context idctdspVittorio Giovara
Use it instead of the embedded mpegvideo one. Update init function signature to load it directly from the callers.
2016-03-23vc1dec: wmv2dec: Validate ff_intrax8_common_init return valueVittorio Giovara
2016-03-22intrax8: Move error resilience out of intrax8Vittorio Giovara
The intrax8 decoding process does not imply any kind of error resilience, and the only call present is more related to how mpegvideo works rather than anything else. Therefore have the parent decoders carry out er when actually needed.
2015-09-02avcodec/mpegvideo: change bit_rate to 64bitMichael Niedermayer
32bit is not sufficient for all cases Fixes: signal_sigabrt_7ffff6ac8cc9_686_cov_1897408623_microsoft_new_way_to_shove_mpeg2_in_asf.dvr_ms Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-28Put remaining pieces of CODEC_FLAG_EMU_EDGE under FF_API_EMU_EDGE.Ronald S. Bultje
The amv one probably looks suspicious, but since it's an intra-only codec, I couldn't possibly imagine what it would use the edge for, and the vsynth fate result doesn't change, so it's probably OK.
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-02-18Merge commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd'Michael Niedermayer
* commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd': wmv2: Return meaningful error codes Conflicts: libavcodec/wmv2dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17wmv2: Return meaningful error codesHimangi Saraogi
2015-02-13avcodec/wmv2: simplify cbp_table_index calculationzhaoxiu.zeng
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03Merge commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce'Michael Niedermayer
* commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce': wmv2: K&R formatting cosmetics Conflicts: libavcodec/wmv2.c libavcodec/wmv2dec.c libavcodec/wmv2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03wmv2: K&R formatting cosmeticsGabriel Dume
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-06-19Merge commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9'Michael Niedermayer
* commit 'e74433a8e6fc00c8dbde293c97a3e45384c2c1d9': dsputil: Split clear_block*/fill_block* off into a separate context Conflicts: configure libavcodec/asvdec.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dsputil.h libavcodec/eamad.c libavcodec/intrax8.c libavcodec/mjpegdec.c libavcodec/ppc/dsputil_ppc.c libavcodec/vc1dec.c libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-19dsputil: Split clear_block*/fill_block* off into a separate contextDiego Biurrun
2014-03-23Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavc: drop ff_pixfmt_list_420 Conflicts: libavcodec/flvdec.c libavcodec/msmpeg4dec.c libavcodec/rv10.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23lavc: drop ff_pixfmt_list_420Vittorio Giovara
2014-03-17Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'Michael Niedermayer
* commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b': mpegvideo: move mpegvideo formats-related defines to mpegutils.h Conflicts: libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_mvpred.h libavcodec/svq1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17mpegvideo: move mpegvideo formats-related defines to mpegutils.hVittorio Giovara
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-03-29wmv2: drop non emu edge modeMichael Niedermayer
slightly (~ 0.5%) faster, tested with time ./ffmpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-04 11:30:18 +0300