Signed-off-by: Zhong Li <[email protected]>
---
libavcodec/qsvenc.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index e534dcf..2695d4f 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -444,6 +444,7 @@ static int init_video_param(AVCodecContext *avctx,
QSVEncContext *q)
const AVPixFmtDescriptor *desc;
float quant;
int ret;
+ mfxVersion ver;
ret = ff_qsv_codec_id_to_mfx(avctx->codec_id);
if (ret < 0)
@@ -611,8 +612,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer
*)&q->extco;
-#if QSV_HAVE_CO2
if (avctx->codec_id == AV_CODEC_ID_H264) {
+#if QSV_HAVE_CO2
q->extco2.Header.BufferId = MFX_EXTBUFF_CODING_OPTION2;
q->extco2.Header.BufferSz = sizeof(q->extco2);
@@ -675,11 +676,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
}
#endif
q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer
*)&q->extco2;
- }
#endif
+
#if QSV_HAVE_MF
- if (avctx->codec_id == AV_CODEC_ID_H264) {
- mfxVersion ver;
ret = MFXQueryVersion(q->session,&ver);
if (ret >= MFX_ERR_NONE && QSV_RUNTIME_VERSION_ATLEAST(ver, 1,
25)) {
q->extmfp.Header.BufferId = MFX_EXTBUFF_MULTI_FRAME_PARAM;
--
2.7.4
_______________________________________________
ffmpeg-devel mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
