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-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>
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 flagsVittorio Giovara
Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-06-08Merge commit 'da0c8664b4dc906696803685f7e53ade68594ab8'Michael Niedermayer
* commit 'da0c8664b4dc906696803685f7e53ade68594ab8': mpegvideo: Move various temporary buffers to a separate context Conflicts: libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/rv34.c libavcodec/vc1_mc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08mpegvideo: Move various temporary buffers to a separate contextVittorio Giovara
2015-05-22Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'Michael Niedermayer
* commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42': mpegvideo: Drop flags and flags2 Conflicts: libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/ratecontrol.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-22mpegvideo: Drop flags and flags2Vittorio Giovara
They are just duplicates of AVCodecContext members so use those instead.
2015-05-17lavc/vc1: Never decode vc1 as gray if gray decoding was not enabled.Carl Eugen Hoyos
2015-03-08avcodec/vc1_mc: optimize get_chroma_mv, and add get_luma_mvzhaoxiu.zeng
Test results: before: fate-suite/vc1/SA10091.vc1: 1062 decicycles in ff_vc1_mc_4mv_chroma's get mv, 4089 runs, 7 skips fate-suite/vc1/SA10143.vc1: 1112 decicycles in ff_vc1_mc_4mv_luma's get mv, 4096 runs, 0 skips fate-suite/vc1/SA20021.vc1: 991 decicycles in ff_vc1_mc_4mv_chroma get mv, 8192 runs, 0 skips after: fate-suite/vc1/SA10091.vc1: 940 decicycles in ff_vc1_mc_4mv_chroma's get mv, 4096 runs, 0 skips fate-suite/vc1/SA10143.vc1: 786 decicycles in ff_vc1_mc_4mv_luma's get mv, 4096 runs, 0 skips fate-suite/vc1/SA20021.vc1: 876 decicycles in ff_vc1_mc_4mv_chroma get mv, 8189 runs, 3 skips Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-07avcodec/vc1_mc: change the type of s_rndtblfield to uint8_tzhaoxiu.zeng
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-07avcodec/vc1_mc: Simplify v_edge_pos and src_y correction when fieldmv is truezhaoxiu.zeng
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-07avcodec/vc1_mc: remove useless variablesZeng Zhaoxiu
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16avcodec/vc1_mc: factor out helper functions for scaling blockszhaoxiu.zeng
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16avcodec/vc1_mc: move median4() to mathops.hzhaoxiu.zeng
Needed for architecture specific optimizations Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-25avcodec/vc1_mc: use the same reference as luma does in ff_vc1_mc_4mv_chroma()Michael Niedermayer
Fixes Ticket3230 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13Merge commit '28d82b7675bea76a1349070a3cdd737d964d4775'Michael Niedermayer
* commit '28d82b7675bea76a1349070a3cdd737d964d4775': vc1dec: refactor check with missing parenthesis Conflicts: libavcodec/vc1_mc.c tests/ref/fate/vc1_ilaced_twomv Theres no change to the reference checksums as this bug was not in FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13vc1dec: refactor check with missing parenthesisVittorio Giovara
FATE tests updated accordingly, no visual difference. CC: libav-stable@libav.org Bug-Id: CID 1087087
2014-11-13vc1dec: always initialize tx and tyVittorio Giovara
CC: libav-stable@libav.org Bug-Id: CID 1245702 / CID 1245703
2014-10-09Merge commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576'Michael Niedermayer
* commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576': vc1: Split the decoder in components Conflicts: libavcodec/Makefile libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-08vc1: Split the decoder in componentsLuca Barbato
Speed up the overall compilation time.