diff options
| author | Kyle Schwarz <zeranoe@gmail.com> | 2016-06-18 00:33:12 -0400 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2016-10-31 19:23:40 +0000 |
| commit | 5d542936680e1f3b67bd48265fc56c9227436e48 (patch) | |
| tree | 5160739258d0056939017900b53f33cc318536ce | |
| parent | 4e7a7a96cfc8654a4bf5d3b6c249113ea5ade295 (diff) | |
| download | ffmpeg-5d542936680e1f3b67bd48265fc56c9227436e48.tar.gz | |
avcodec/qsv: remove MFX_EXTBUFF_CODING_OPTION3
4th generation Intel CPUs don't support MFX_EXTBUFF_CODING_OPTION3.
This patch fixes bug #5324.
| -rw-r--r-- | libavcodec/qsvenc.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 84eba4191e..7445d5b122 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -134,9 +134,6 @@ static void dump_video_param(AVCodecContext *avctx, QSVEncContext *q, #if QSV_HAVE_CO2 mfxExtCodingOption2 *co2 = (mfxExtCodingOption2*)coding_opts[1]; #endif -#if QSV_HAVE_CO3 - mfxExtCodingOption3 *co3 = (mfxExtCodingOption3*)coding_opts[2]; -#endif av_log(avctx, AV_LOG_VERBOSE, "profile: %s; level: %"PRIu16"\n", print_profile(info->CodecProfile), info->CodecLevel); @@ -188,12 +185,6 @@ static void dump_video_param(AVCodecContext *avctx, QSVEncContext *q, info->ICQQuality, co2->LookAheadDepth); } #endif -#if QSV_HAVE_QVBR - else if (info->RateControlMethod == MFX_RATECONTROL_QVBR) { - av_log(avctx, AV_LOG_VERBOSE, "QVBRQuality: %"PRIu16"\n", - co3->QVBRQuality); - } -#endif av_log(avctx, AV_LOG_VERBOSE, "NumSlice: %"PRIu16"; NumRefFrame: %"PRIu16"\n", info->NumSlice, info->NumRefFrame); @@ -573,12 +564,6 @@ static int qsv_retrieve_enc_params(AVCodecContext *avctx, QSVEncContext *q) .Header.BufferSz = sizeof(co2), }; #endif -#if QSV_HAVE_CO3 - mfxExtCodingOption3 co3 = { - .Header.BufferId = MFX_EXTBUFF_CODING_OPTION3, - .Header.BufferSz = sizeof(co3), - }; -#endif mfxExtBuffer *ext_buffers[] = { (mfxExtBuffer*)&extradata, @@ -586,9 +571,6 @@ static int qsv_retrieve_enc_params(AVCodecContext *avctx, QSVEncContext *q) #if QSV_HAVE_CO2 (mfxExtBuffer*)&co2, #endif -#if QSV_HAVE_CO3 - (mfxExtBuffer*)&co3, -#endif }; int need_pps = avctx->codec_id != AV_CODEC_ID_MPEG2VIDEO; |