diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 16:51:45 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 16:51:45 +0000 |
| commit | c63da6e91630b72fa5916314910cb35e82331f70 (patch) | |
| tree | 14404ba40f2700a4e38eb81d34693a35e2a8b1bb /libavcodec/qsvenc.c | |
| parent | 32766877b4e1a7eeacfbca50c55d55ce8bb7b73d (diff) | |
| parent | 9cac1b4b4f1532fb2aeef54799285360656be5eb (diff) | |
| download | ffmpeg-c63da6e91630b72fa5916314910cb35e82331f70.tar.gz | |
Merge commit '9cac1b4b4f1532fb2aeef54799285360656be5eb'
* commit '9cac1b4b4f1532fb2aeef54799285360656be5eb':
qsvenc: Add private option to replace coder_type
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/qsvenc.c')
| -rw-r--r-- | libavcodec/qsvenc.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 3bac8cf65c..be54bf9a14 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -460,8 +460,14 @@ 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); - q->extco.CAVLC = avctx->coder_type == FF_CODER_TYPE_VLC ? - MFX_CODINGOPTION_ON : MFX_CODINGOPTION_UNKNOWN; +#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; q->extco.PicTimingSEI = q->pic_timing_sei ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_UNKNOWN; |