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-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-04cosmetics: Fix spelling mistakesVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
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-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: 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-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-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-08-10Merge commit '1542ec96389f32e5081c6c607e4b6f5e257ccdf2'Hendrik Leppkes
* commit '1542ec96389f32e5081c6c607e4b6f5e257ccdf2': cosmetics: Drop spurious spaces from if clauses Conflicts: libavcodec/vc1_block.c Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-08cosmetics: Drop spurious spaces from if clausesPaolo Bizzarri
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
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-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-05-08avcodec/vc1: Skip chroma operations if CODEC_FLAG_GRAY is setMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28avcodec/vc1_block: Optimize vc1_decode_i_block_adv()zhaoxiu.zeng
9127 -> 8936 decicycles (fate-suite/vc1/SA10143.vc1) 13855 -> 10976 decicycles (fate-suite/vc1/SA20021.vc1) tests done by the author over this function but with the whole patchset applied not just this commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28avcodec/vc1_block: Optimize vc1_decode_i_block()zhaoxiu.zeng
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28avcodec/vc1_block: cosmeticszhaoxiu.zeng
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28avcodec/vc1_block: move early exit code up in ff_vc1_pred_dc()zhaoxiu.zeng
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28avcodec/vc1_block: Use av_clip_uintp2()zhaoxiu.zeng
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28avcodec/vc1_block: Optimize vc1_decode_ac_coeff()zhaoxiu.zeng
Avoid branches in sign handling Move local variables to where they are used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28avcodec/vc1_block: Simplify dcdiff initializationzhaoxiu.zeng
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28avcodec/vc1_block: Simplify dir_ptr / pred initializationzhaoxiu.zeng
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28avcodec/vc1: Simplify pred/mc loopszhaoxiu.zeng
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28avcodec/vc1: Simplify dmv_y initializationzhaoxiu.zeng
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28avcodec/vc1: Simplify code setting and using extend_x/yzhaoxiu.zeng
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28avcodec/vc1: Make init_block_index() inlinezhaoxiu.zeng
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28avcodec/vc1: use uint8_t for size_tablezhaoxiu.zeng
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-28avcodec/vc1: simplify offset table and accesszhaoxiu.zeng
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-25Merge commit 'd25afb579facc83fd3a839f21411124d0b09f0ba'Michael Niedermayer
* commit 'd25afb579facc83fd3a839f21411124d0b09f0ba': vc1: Set the is_intra bitfield to all 1 when needed Conflicts: libavcodec/vc1_block.c See: 04152a31cb41a7ca3cc0bde9d962454fc30bab9c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-25Merge commit 'b67138598ce158e3083f6295a27b63e2065d5ecb'Michael Niedermayer
* commit 'b67138598ce158e3083f6295a27b63e2065d5ecb': vc1: Simplify a little setting the intra variables Conflicts: libavcodec/vc1_block.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-25vc1: Set the is_intra bitfield to all 1 when neededLuca Barbato
Keep the code as similar as possible across the codepaths to ease spotting it for factorization. Based on a patch from Michael Niedermayer <michaelni@gmx.at>.
2014-11-25vc1: Simplify a little setting the intra variablesLuca Barbato
The code currently set the information in at least 4 places, spare some pointless loops. Make the code in the loop a little uniform to make easier factorize it out later.
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.