Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-10-04avcodec: use HAVE_THREADS header guards to silence -Wunused-functionGanesh Ajjanagadde
When compiled with --disable-pthreads, e.g http://fate.ffmpeg.org/report.cgi?time=20150917015044&slot=alpha-debian-qemu-gcc-4.7, a bunch of -Wunused-functions are reported due to missing header guards around threading related functions. This patch should silence such warnings. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-10-01avcodec/vp8: Do not use num_coeff_partitions in thread/buffer setupMichael Niedermayer
The variable is not a constant and can lead to race conditions Fixes: repro.webm (not reproducable with FFmpeg alone) Found-by: Dale Curtis <dalecurtis@google.com> Tested-by: Dale Curtis <dalecurtis@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-18Merge commit '7bf9647264308d2df74b2b50669f2d02a7ecc90b'Hendrik Leppkes
* commit '7bf9647264308d2df74b2b50669f2d02a7ecc90b': vp7: bound checking in vp7_decode_frame_header Only partially merged, see 46f72ea507afee6adb0d2324848159063d0e7afc Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-16vp7: bound checking in vp7_decode_frame_headerFederico Tomassetti
CC: libav-stable@libav.org
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-07-18avcodec/vp8: Check buffer size in vp8_decode_frame_header()Michael Niedermayer
avoids null pointer dereference Fixes: signal_sigsegv_d5de40_964_vp80-00-comprehensive-010.ivf with memlimit of 1048576 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-18avcodec/vp8: Fix null pointer dereference in ff_vp8_decode_free()Michael Niedermayer
Fixes: signal_sigsegv_d5de23_967_vp80_00_comprehensive_010.ivf with memlimit 524288 Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-06-09vp8: change mv_{min,max}.{x,y} type to intAndreas Cadhalpun
If one of the dimensions is larger than 8176, s->mb_width or s->mb_height is larger than 511, leading to an int16_t overflow of s->mv_max.{x,y}. This then causes av_clip to be called with amin > amax. Changing the type to int avoids the overflow and has no negative effect, because s->mv_max is only used in clamp_mv for clipping. Since mv_max.{x,y} is positive and mv_min.{x,y} negative, av_clip can't increase the absolute value. The input to av_clip is an int16_t, and thus the output fits into int16_t as well. For additional safety, s->mv_{min,max}.{x,y} are clipped to int16_t range before use. Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-05-06avcodec/vp8: Suppress empty body warningsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-14lavc: use LOCAL_ALIGNED instead of DECLARE_ALIGNEDChristophe Gisquet
The later may yield incorrect code for on-stack variables. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-11avcodec/vp8: Fix undefined shifts in vp8_mc_luma()Michael Niedermayer
Found-by: Clang -fsanitize=shift Reported-by: Thierry Foucu <tfoucu@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-18avcodec/vp8: remove double ;;Clément Bœsch
2015-01-15Merge commit '014b6b416fec89777cb9cff61bcf7896eaf7cf39'Michael Niedermayer
* commit '014b6b416fec89777cb9cff61bcf7896eaf7cf39': vp8: improve memory allocation checks Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-15vp8: improve memory allocation checksVittorio Giovara
Check memory earlier, check one more allocation and clean up on error. CC: libav-stable@libav.org Bug-Id: CID 1257773
2014-11-18Merge commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa'Michael Niedermayer
* commit '85dc006b1a829726dd5e3a9b0fcc6a1dbfe6dffa': lavc: fix bitshifts amount bigger than the type Conflicts: libavcodec/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-18lavc: fix bitshifts amount bigger than the typeVittorio Giovara
CC: libav-stable@libav.org Bug-Id: CID 1194387 / CID 1194389 / CID 1194393 / CID 1206638
2014-11-13vp7: fix checking vp7_feature_value_size()Michael Niedermayer
CC: libav-stable@libav.org Bug-Id: CID 1197061
2014-10-09Merge commit '65875a8b3b079752da25a61ec188d2e3d90a569f'Michael Niedermayer
* commit '65875a8b3b079752da25a61ec188d2e3d90a569f': vp8: initialize color space and range properties Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-08vp8: initialize color space and range propertiesVittorio Giovara
2014-08-15Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-01Merge commit '79793f833784121d574454af4871866576c0749d'Michael Niedermayer
* commit '79793f833784121d574454af4871866576c0749d': Update Fiona's name in copyright statements. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-01Update Fiona's name in copyright statements.Diego Biurrun
2014-06-28avcodec/vp8: Fix multiple ff_thread_finish_setup() callsMichael Niedermayer
Fixes Ticket3725 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18avcodec/vp8: fix () in macrosMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-13Use rac_get_prob branchy version when used within a conditional branch.Matt Oliver
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-07Fix standalone compilation of vp7 and vp8 decoder.Carl Eugen Hoyos
Fixes ticket #3536.
2014-04-06avcodec/vp8: fix checking vp7_feature_value_sizeMichael Niedermayer
Fixes CID1197061 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-05avcodec/vp8: fix name of copy_luma()Michael Niedermayer
This function was introduced by ac4b32df71bd932838043a4838b86d11e169707f Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'Michael Niedermayer
* commit 'ac4b32df71bd932838043a4838b86d11e169707f': On2 VP7 decoder Conflicts: Changelog libavcodec/arm/h264pred_init_arm.c libavcodec/arm/vp8dsp.h libavcodec/arm/vp8dsp_init_arm.c libavcodec/arm/vp8dsp_init_armv6.c libavcodec/arm/vp8dsp_init_neon.c libavcodec/avcodec.h libavcodec/h264pred.c libavcodec/version.h libavcodec/vp8.c libavcodec/vp8.h libavcodec/vp8data.h libavcodec/vp8dsp.c libavcodec/vp8dsp.h libavcodec/x86/h264_intrapred_init.c libavcodec/x86/vp8dsp_init.c See: 89f2f5dbd7a23e7ec1073d3c08d46093a01a4135 and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04On2 VP7 decoderPeter Ross
Further performance improvements and security fixes by Vittorio Giovara, Luca Barbato and Diego Biurrun. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-03-30Merge commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5'Michael Niedermayer
* commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5': vp8: K&R formatting cosmetics Conflicts: libavcodec/vp8.c libavcodec/vp8.h libavcodec/vp8data.h libavcodec/vp8dsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-29vp8: K&R formatting cosmeticsVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-03-29avcodec/vp7: check buffer sizeMichael Niedermayer
Fixes overread Fixes Ticket 3501 Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27avcodec/vp7: Fix null pointer dereference in vp7_decode_frame_header()Michael Niedermayer
This simply copies the "interframe without a prior keyframe" check thats done later into vp7_decode_frame_header() Found-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-25On2 VP7 decoderPeter Ross
Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: BBB previous patch reviewed by jason Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-25avcodec/vp8: vp8_find_free_bufferPeter Ross
Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-15avcodec/vp8dsp: add VP7 idct and loop filterPeter Ross
Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-04Merge commit 'e46ad30a808744ddf3855567e162292a4eaabac7'Michael Niedermayer
* commit 'e46ad30a808744ddf3855567e162292a4eaabac7': vp8: use a fixed-size edge emu buffer Conflicts: libavcodec/vp8.c libavcodec/vp8.h See: face578d56c2d1375e40d5e2a28acc122132bc55 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-04vp8: use a fixed-size edge emu bufferAnton Khirnov
The reason is the same as for e588615d938f8581f0d6f3771662d08cadfc00de Based on a patch by Ronald S. Bultje <rsbultje@gmail.com>
2014-01-20vp8: remove redundant "equals 1" testPeter Ross
mb_layout is either zero or non-zero. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-09Merge commit 'ef8c93e2f18c624d0c266687e43ab99af7921dd3'Michael Niedermayer
* commit 'ef8c93e2f18c624d0c266687e43ab99af7921dd3': vp8: drop support for real (non-emulated) edges Conflicts: tests/fate/vpx.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-09vp8: drop support for real (non-emulated) edgesAnton Khirnov
They are not measurably faster on x86, they might be somewhat faster on other platforms due to missing emu edge SIMD, but the gain is not large enough to justify the added complexity.
2013-11-15Merge commit '458446acfa1441d283dacf9e6e545beb083b8bb0'Michael Niedermayer
* commit '458446acfa1441d283dacf9e6e545beb083b8bb0': lavc: Edge emulation with dst/src linesize Conflicts: libavcodec/cavs.c libavcodec/h264.c libavcodec/hevc.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/rv34.c libavcodec/svq3.c libavcodec/vc1dec.c libavcodec/videodsp.h libavcodec/videodsp_template.c libavcodec/vp3.c libavcodec/vp8.c libavcodec/wmv2.c libavcodec/x86/videodsp.asm libavcodec/x86/videodsp_init.c Changes to the asm are not merged, they are left for volunteers or in their absence for later. The changes this merge introduces are reordering of the function arguments See: face578d56c2d1375e40d5e2a28acc122132bc55 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-15lavc: Edge emulation with dst/src linesizeRonald S. Bultje
Allow supporting files for which the image stride is smaller than the maximum block size + number of subpel mc taps, e.g. a 64x64 VP9 file or a 16x16 VP8 file with -fflags +emu_edge.
2013-11-10avcodec/vp8: remove unused webp_decode_frame()Michael Niedermayer
See: libavcodec/webp.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01Merge commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be'Michael Niedermayer
* commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be': vp8: stop using deprecated avcodec_set_dimensions vp56: stop using deprecated avcodec_set_dimensions vp3: stop using deprecated avcodec_set_dimensions txd: stop using deprecated avcodec_set_dimensions truemotion1: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/txd.c libavcodec/vp56.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-31vp8: stop using deprecated avcodec_set_dimensionsAnton Khirnov
2013-10-16lavc: Convert some remaining strides to ptrdiff_tRonald S. Bultje