diff options
| author | Li, Zhong <zhong.li@intel.com> | 2017-11-27 11:19:57 -0500 |
|---|---|---|
| committer | Maxym Dmytrychenko <maxim.d33@gmail.com> | 2017-11-24 19:38:52 +0100 |
| commit | b843b343d8a3210ae37a2342b1904a5bd1e5fc6e (patch) | |
| tree | d966fb6e1e734512d01a31b3cfbc2287600d3bd1 /libavcodec/qsvenc.c | |
| parent | 136e7cf64ce9e78de7158d6720539d51cb96b743 (diff) | |
| download | ffmpeg-streaming-b843b343d8a3210ae37a2342b1904a5bd1e5fc6e.zip ffmpeg-streaming-b843b343d8a3210ae37a2342b1904a5bd1e5fc6e.tar.gz | |
qsvenc: cavlc option is only available for h264
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>
Diffstat (limited to 'libavcodec/qsvenc.c')
| -rw-r--r-- | libavcodec/qsvenc.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index c7e5947..9db9eb3 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -540,19 +540,20 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) if (avctx->codec_id != AV_CODEC_ID_HEVC) { q->extco.Header.BufferId = MFX_EXTBUFF_CODING_OPTION; q->extco.Header.BufferSz = sizeof(q->extco); -#if FF_API_CODER_TYPE -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->coder_type != 0) - q->cavlc = avctx->coder_type == FF_CODER_TYPE_VLC; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - q->extco.CAVLC = q->cavlc ? MFX_CODINGOPTION_ON - : MFX_CODINGOPTION_UNKNOWN; if (q->rdo >= 0) q->extco.RateDistortionOpt = q->rdo > 0 ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; if (avctx->codec_id == AV_CODEC_ID_H264) { +#if FF_API_CODER_TYPE +FF_DISABLE_DEPRECATION_WARNINGS + if (avctx->coder_type >= 0) + q->cavlc = avctx->coder_type == FF_CODER_TYPE_VLC; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + q->extco.CAVLC = q->cavlc ? MFX_CODINGOPTION_ON + : MFX_CODINGOPTION_UNKNOWN; + if (avctx->strict_std_compliance != FF_COMPLIANCE_NORMAL) q->extco.NalHrdConformance = avctx->strict_std_compliance > FF_COMPLIANCE_NORMAL ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; |
