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
2017-11-30Merge commit 'b843b343d8a3210ae37a2342b1904a5bd1e5fc6e'James Almer
* commit 'b843b343d8a3210ae37a2342b1904a5bd1e5fc6e': qsvenc: cavlc option is only available for h264 Merged-by: James Almer <jamrial@gmail.com>
2017-11-24qsvenc: cavlc option is only available for h264Li, Zhong
Moving option definition to h264 implementation and fixing command line defaults in order to properly respect cavlc input value Signed-off-by: Zhong Li <zhong.li@intel.com> Signed-off-by: Maxym Dmytrychenko <maxim.d33@gmail.com>
2017-03-12Merge commit '37a9015ee84c15fec5247ba8f6577351a25fa8d2'Mark Thompson
* commit '37a9015ee84c15fec5247ba8f6577351a25fa8d2': qsvenc: add support for p010 Merged-by: Mark Thompson <sw@jkqxz.net>
2016-10-31qsv: Merge libav implementationMark Thompson
Merged as-at libav 398f015, and therefore includes outstanding skipped merges 04b17ff and 130e1f1. All features not in libav are preserved, and no options change.
2016-10-06avcodec/qsvenc_h264: fix segfault when a53 SEI is not availableNablet Developer
Signed-off-by: Nablet Developer <sdk@nablet.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-09-14lavc: Enable a53cc by default for x264 and qsv_h264.Carl Eugen Hoyos
2016-08-01Merge commit 'b24dafe10572254ff0decc18b0d7c3d3707d5a29'James Almer
* commit 'b24dafe10572254ff0decc18b0d7c3d3707d5a29': lavc: drop unnecessary h264dec.h includes Merged-by: James Almer <jamrial@gmail.com>
2016-07-29Merge commit '9df889a5f116c1ee78c2f239e0ba599c492431aa'Clément Bœsch
* commit '9df889a5f116c1ee78c2f239e0ba599c492431aa': h264: rename h264.[ch] to h264dec.[ch] Merged-by: Clément Bœsch <u@pkh.me>
2016-07-22qsvenc: add support for p010Anton Khirnov
2016-06-21lavc: drop unnecessary h264dec.h includesAnton Khirnov
2016-06-21h264: rename h264.[ch] to h264dec.[ch]Anton Khirnov
This is more consistent with the naming of other decoders.
2016-06-19avcodec/qsvenc_h264: declare the QSVEncContext variable before using itJames Almer
Should fix compilation. Regression introduced by commit 63adb3602d3b35c5d1df14cf1e477bc458f96b7b Signed-off-by: James Almer <jamrial@gmail.com>
2016-06-19libavcodec: factor out SEI generation for A53 captionsAndrey Turkin
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-01-27Merge commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'Derek Buitenhuis
* commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92' lavc: Move b_frame_strategy and b_sensitivity to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-01-21lavc: Move b_frame_strategy and b_sensitivity to codec private optionsVittorio Giovara
The b_frame_strategy option is only used by mpegvideoenc, qsv, x264, and xavs, while b_sensitivity is only used by mpegvideoenc. These are very codec-specific options, so deprecate the global variants. Set proper limits to the maximum allowed values. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-12-01qsvenc: write a53 caption data to SEIWill Kelleher
Signed-off-by: Will Kelleher <wkelleher@gogoair.com> Previous version reviewed-by: Ivan Uskov <ivan.uskov@nablet.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-29Merge commit 'fc4c27c4edfc6a5f9bc7c696e823652474a65ce8'Hendrik Leppkes
* commit 'fc4c27c4edfc6a5f9bc7c696e823652474a65ce8': qsvenc: expose additional encoding options Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-11-29Merge commit 'e7d7cf86dcaba8eaaed62c80172ff0aff2588c2a'Hendrik Leppkes
* commit 'e7d7cf86dcaba8eaaed62c80172ff0aff2588c2a': qsvenc: support more RC methods Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-11-24Merge commit 'fb8753ada23189076bdf903c1c001c0ca8287fae'Derek Buitenhuis
* commit 'fb8753ada23189076bdf903c1c001c0ca8287fae': qsvenc: factor out common options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-11-20qsvenc: expose additional encoding optionsAnton Khirnov
2015-11-20qsvenc: factor out common optionsAnton Khirnov
2015-09-29Merge commit '5d2daebf3cc8de4cee1973db6a2229beaad3b7cd'Hendrik Leppkes
* commit '5d2daebf3cc8de4cee1973db6a2229beaad3b7cd': qsvenc: mark the encoders as INIT_CLEANUP Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-28qsvenc: mark the encoders as INIT_CLEANUPAnton Khirnov
Should fix some leaks on init failure.
2015-08-30avcodec/qsv : Added look ahead rate control modeSven Dueking
Reviewed-by: Ivan Uskov <ivan.uskov@nablet.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-19avcodec/qsvenc: Added PicTiming SEISven Dueking
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
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-02avcodec/qsvenc_h264: Change the set of performance presets to match with the ↵Ivan Uskov
MFX library constants. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-28Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2'Michael Niedermayer
* commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2': lavc: add Intel libmfx-based H.264 encoder Conflicts: Changelog libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-28lavc: add Intel libmfx-based H.264 encoderAnton Khirnov