From: Kyle Schwarz <zera...@gmail.com>
4th generation Intel CPUs don't support MFX_EXTBUFF_CODING_OPTION3.
This patch fixes bug #5324.
---
libavcodec/qsvenc.c | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 132cf47..a561df8 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -132,9 +132,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);
@@ -186,12 +183,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);
@@ -577,12 +568,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,
@@ -590,9 +575,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;
--
2.7.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
