Derek Buitenhuis
2e9b995e4f
Merge commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'
...
* commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'
lavc: Move b_frame_strategy and b_sensitivity to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-01-27 20:18:04 +00:00
Vittorio Giovara
0e6c853221
lavc: Move b_frame_strategy and b_sensitivity to codec private options
...
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>
2016-01-21 15:33:19 -05:00
Hendrik Leppkes
5bc9c7a6db
Merge commit 'fc4c27c4edfc6a5f9bc7c696e823652474a65ce8'
...
* commit 'fc4c27c4edfc6a5f9bc7c696e823652474a65ce8':
qsvenc: expose additional encoding options
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-11-29 15:22:53 +01:00
Derek Buitenhuis
9c35b8e219
Merge commit 'fb8753ada23189076bdf903c1c001c0ca8287fae'
...
* commit 'fb8753ada23189076bdf903c1c001c0ca8287fae':
qsvenc: factor out common options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-11-24 13:48:28 +00:00
Anton Khirnov
fc4c27c4ed
qsvenc: expose additional encoding options
2015-11-20 09:29:50 +01:00
Anton Khirnov
fb8753ada2
qsvenc: factor out common options
2015-11-20 09:26:12 +01:00
Vittorio Giovara
2d59159508
lavc: AV-prefix a few left out capabilities
2015-10-15 15:47:16 +02:00
Hendrik Leppkes
6668214521
Merge commit '5d2daebf3cc8de4cee1973db6a2229beaad3b7cd'
...
* commit '5d2daebf3cc8de4cee1973db6a2229beaad3b7cd':
qsvenc: mark the encoders as INIT_CLEANUP
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 14:12:47 +02:00
Anton Khirnov
5d2daebf3c
qsvenc: mark the encoders as INIT_CLEANUP
...
Should fix some leaks on init failure.
2015-09-28 15:43:04 +02:00
Michael Niedermayer
444e9874a7
Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'
...
* 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-27 22:50:18 +02:00
Michael Niedermayer
96ee6b9962
Merge commit '3a85397e8bb477eb34678d9edc52893f57003226'
...
* commit '3a85397e8bb477eb34678d9edc52893f57003226':
lavc: add Intel libmfx-based MPEG2 encoder
Conflicts:
Changelog
configure
libavcodec/allcodecs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-09 11:17:12 +02:00
Anton Khirnov
3a85397e8b
lavc: add Intel libmfx-based MPEG2 encoder
2015-07-08 23:39:28 +02:00
