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
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-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().
2014-03-14Merge commit '05563ccacc98fd185affdbf8cbaf094caf36b852'Michael Niedermayer
* commit '05563ccacc98fd185affdbf8cbaf094caf36b852': dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names Conflicts: libavcodec/bit_depth_template.c libavcodec/motionpixels_tablegen.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-13dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl namesDiego Biurrun
Also switch from "tbl" to "tab" name suffixes.
2013-12-23Convert XvMC to hwaccel v3Ivan Kalvachev
Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06avcodec/error_resilience: check that er is supported before attempting to ↵Michael Niedermayer
read the status of the previous slice Fixes incorrectly set error_occured and improves speed Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06avcodec/error_resilience: factor er_supported() check outMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Deprecate obsolete XvMC hardware decoding support Conflicts: libavcodec/mpeg12.c libavcodec/mpeg12dec.c libavcodec/mpegvideo.c libavcodec/options_table.h libavutil/pixdesc.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14Deprecate obsolete XvMC hardware decoding supportDiego Biurrun
XvMC has long ago been superseded by newer acceleration APIs, such as VDPAU, and few downstreams still support it. Furthermore XvMC is not implemented within the hwaccel framework, but requires its own specific code in the MPEG-1/2 decoder, which is a maintenance burden.
2013-10-28error resilience: check error_concealment, not err_recognition.Anton Khirnov
err_recognition is supposed to trigger detecting and reporting errors, not trying to fix them.
2013-10-27avcodec/error_resilience check error_concealment, not err_recognition.Anton Khirnov
err_recognition is supposed to trigger detecting and reporting errors, not trying to fix them. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-01avcodec/error_resilience: change out commented printf() to av_log()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-18avcodec/error_resilience: Fix handling of matrox mpeg2Michael Niedermayer
Fixes Ticket2615 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-18Revert "Merge commit of 'vdpau: remove old-style decoders'"Michael Niedermayer
This reverts commit bf36dc50ea448999c8f8c7a35f6139a7040f6275, reversing changes made to b7fc2693c70fe72936e4ce124c802ac23857c476. Conflicts: libavcodec/h264.c Keeping support for the old VDPAU API has been requested by our VDPAU maintainer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8'Michael Niedermayer
* commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8': vdpau: remove old-style decoders Conflicts: libavcodec/allcodecs.c libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/vc1dec.c libavcodec/vdpau.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-05vdpau: remove old-style decodersRémi Denis-Courmont
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-04-08lavc: Make pointers to ff_cropTbl constMartin Storsjö
There's no point in these pointers not being const. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-22error_resilience: fix const correctness, silence warningsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-20er: set error_occured on missing slicesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>