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-03-14avcodec/error_resilience: Use a symmetric check for skipping MV estimationMichael Niedermayer
This speeds up the testcase by a factor of 4 Fixes: Timeout Fixes: 13100/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV2_fuzzer-5767533905313792 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 e4289cb253e29e4d62dc46759eb1a45d8f6d82df) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-07-04avcodec/mpeg4videodec: Remove use of FF_PROFILE_MPEG4_SIMPLE_STUDIO as ↵Michael Niedermayer
indicator of studio profile The profile field is changed by code inside and outside the decoder, its not a reliable indicator of the internal codec state. Maintaining it consistency with studio_profile is messy. Its easier to just avoid it and use only studio_profile Fixes: assertion failure Fixes: ffmpeg_crash_9.avi Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan Caciulescu with AFLSmart Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-04-26avcodec/error_resilience: Fix integer overflow in filter181()Michael Niedermayer
Fixes: runtime error: signed integer overflow: 197710 * 10923 cannot be represented in type 'int' Fixes: 7010/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-5667127596941312 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-04-02mpeg4video: Add support for MPEG-4 Simple Studio Profile.Kieran Kunhya
This is a profile supporting > 8-bit video and has a higher quality DCT
2018-01-05avcodec/error_resilience: remove unused headerJames Almer
Signed-off-by: James Almer <jamrial@gmail.com>
2017-11-26error_resilience: remove avpriv_atomic usageRostislav Pehlivanov
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-10-22Merge commit '7b917041184874e7d7cba4450813de7e0bb28a33'James Almer
* commit '7b917041184874e7d7cba4450813de7e0bb28a33': lavc: Drop deprecated VDPAU codec capability Merged-by: James Almer <jamrial@gmail.com>
2017-03-20Merge commit '6b52762951fa138eef59e2628dabb389e0500e40'Clément Bœsch
* commit '6b52762951fa138eef59e2628dabb389e0500e40': error_resilience: Change type of array stride parameters to ptrdiff_t Merged-by: Clément Bœsch <u@pkh.me>
2017-02-16avcodec/error_resilience: Fix "assignment from incompatible pointer type" ↵Michael Niedermayer
warning Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-02-01lavc/error_resilience: Remove two unused variables.Carl Eugen Hoyos
2017-01-22avcodec/error_resilience: update indention after last commitMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-01-22avcodec/error_resilience: Optimize motion recovery code by using blcok listsMichael Niedermayer
This makes the code 7 times faster with the testcase from libfuzzer and should reduce the amount of timeouts we hit in automated fuzzing. (for example 438/fuzz-2-ffmpeg_VIDEO_AV_CODEC_ID_RV40_fuzzer) The code is also faster with more realistic input though the difference is small here as that is far from the worst cases the fuzzers pick out Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-12-26avcodec/error_resilience: Move variable initialization down, remove unneeded ↵Michael Niedermayer
inits This makes the code faster and easier to read Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-12-25avcodec/error_resilience: Merge surrounding status checksMichael Niedermayer
Simplifies code and is also faster Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-12-25avcodec/error_resilience: Factor block parity check outMichael Niedermayer
This makes the code noticably faster when there are lots of blocks Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-09-07error_resilience: Change type of array stride parameters to ptrdiff_tDiego Biurrun
ptrdiff_t is the correct type for array strides and similar.
2016-06-22lavc/error_resilience: remove unused skip_last_mv labelClément Bœsch
Unused since a7b8a6e704d3bea4a2bf724b6b6a3b1de1b08886
2016-06-21Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
2016-05-11Add some more deprecation guardsDiego Biurrun
Avoids unused function/label/variable warnings after the next version bump.
2016-05-04cosmetics: Fix spelling mistakesVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-05-03avcodec/error_resilience: Improve missing slice handling for mpeg2Michael Niedermayer
Fixes: m702_2.avi Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-03-18avcodec/error_resilience: remove unneeded and disabled codeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-03-18avcodec/error_resilience: wait for previous frame to be availableMichael Niedermayer
This is possibly redundant but its more correct Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-15avcodec/error_resilience: avoid accessing previous or next frames tables ↵Michael Niedermayer
beyond height The height of tables can be rounded up for MBAFF but this does not imply that is also true for the previous frames Fixes out of array reads Fixes: c106b36fa36db8ff8f3ed0c82be7bea2/asan_heap-oob_32699f0_6321_467b9a1d7e03d7cfd310b7e65dc53bcc.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-18lavc: put remaining bits of vdpau-in-decoder under FF_API_CAP_VDPAU.Ronald S. Bultje
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-05-09avcodec/error_resilience: support grayscaleMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-05avcodec/error_resilience: Avoid race with updating the error_countMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21avcodec/error_resilience: Fix mbskip_table==NULL codepathMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21Merge commit '5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04'Michael Niedermayer
* commit '5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04': error_resilience: do not require mbintra/skip tables Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-21error_resilience: do not require mbintra/skip tablesAnton Khirnov
h264dec does not use them at all and only allocates them for ER.
2015-01-27Merge commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094'Michael Niedermayer
* commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094': error_resilience: move the MECmpContext initialization into ER code Conflicts: libavcodec/error_resilience.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27error_resilience: move the MECmpContext initialization into ER codeAnton Khirnov
Currently, it needs to be initialized by the ER caller (which is currently either a mpegvideo decoder or h264dec). However, since none of those decoders use MECmpContext for anything except ER, it makes more sense to handle it purely inside ER.
2015-01-11avcodec/error_resilience: Remove special case for H.264 from ↵Michael Niedermayer
is_intra_more_likely This should not be needed Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-04Merge commit 'c442190a6bfd8036f6c32b78e1e96ff3b830f8f0'Michael Niedermayer
* commit 'c442190a6bfd8036f6c32b78e1e96ff3b830f8f0': error_resilience: initialize prev_* variables Note, these variables are not used without initialization prior to the change Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-03error_resilience: initialize prev_* variablesVittorio Giovara
CC: libav-stable@libav.org Bug-Id: CID 732293 / CID 732294
2014-10-12avcodec/error_resilience: avoid pointer arithmetic with NULLMichael Niedermayer
move the code after the existing NULL check Fixes: signal_sigsegv_844d59_10_signal_sigsegv_a17bb7_366_mpegts_mpeg2video_mp2_dvbsub_topfield.rec Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-21error_resilience: Drop asserts from guess_mv()Diego Biurrun
The asserts check struct members that are not referenced in guess_mv() and one of them fails to compile.
2014-08-03avcodec/error_resilience: make error an local variable where possibleMichael Niedermayer
This makes the code easier to understand as the scope of the variable is smaller. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03avcodec/error_resilience: comment out unused assignmentMichael Niedermayer
Its not removed as the code which uses this is out-commented too. Found-by: CSA Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-18Merge commit '2d60444331fca1910510038dd3817bea885c2367'Michael Niedermayer
* commit '2d60444331fca1910510038dd3817bea885c2367': dsputil: Split motion estimation compare bits off into their own context Conflicts: configure libavcodec/Makefile libavcodec/arm/Makefile libavcodec/dvenc.c libavcodec/error_resilience.c libavcodec/h264.h libavcodec/h264_slice.c libavcodec/me_cmp.c libavcodec/me_cmp.h libavcodec/motion_est.c libavcodec/motion_est_template.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/x86/Makefile libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-17dsputil: Split motion estimation compare bits off into their own contextDiego Biurrun
2014-05-13avcodec: add option to make is_intra_more_likely() from error concealment ↵Michael Niedermayer
return "no" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-12vcodec/error_resilience: use av_malloc_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18lavc: er: remove unused variable sizeJanne Grunau
The code using it was removed in d66e305bd1b.
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-17avcodec/error_resilience: fix the case when MVs are not availableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17Merge commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672'Michael Niedermayer
* commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672': er: move relevant fields from Picture to ERPicture Conflicts: libavcodec/error_resilience.c libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17mpegvideo: move mpegvideo formats-related defines to mpegutils.hVittorio Giovara
2014-03-17er: move relevant fields from Picture to ERPictureVittorio Giovara
This is done to disentangle ER from mpegvideo. In order to use a classic Picture, callers can use ff_mpeg_set_erpic() or use a custom function to set the fields. Please note that buffers need to be allocated before calling ff_er_frame_end().