From fda6dcd0b0a32a05e459b62ff5f40bbe56cd3290 Mon Sep 17 00:00:00 2001 From: Mark Thompson Date: Sun, 10 Feb 2019 19:47:01 +0000 Subject: [PATCH] vaapi_encode_mjpeg: Use common quality option Doesn't change anything, but makes the behaviour better match that of the other codecs (the CONSTANT_QUALITY_ONLY flag already ensures that CQP is the only RC mode selectable for MJPEG). --- libavcodec/vaapi_encode_mjpeg.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/vaapi_encode_mjpeg.c b/libavcodec/vaapi_encode_mjpeg.c index 72e794604a..4dcdc3d16b 100644 --- a/libavcodec/vaapi_encode_mjpeg.c +++ b/libavcodec/vaapi_encode_mjpeg.c @@ -438,7 +438,7 @@ static av_cold int vaapi_encode_mjpeg_configure(AVCodecContext *avctx) VAAPIEncodeMJPEGContext *priv = avctx->priv_data; int err; - priv->quality = avctx->global_quality; + priv->quality = ctx->rc_quality; if (priv->quality < 1 || priv->quality > 100) { av_log(avctx, AV_LOG_ERROR, "Invalid quality value %d " "(must be 1-100).\n", priv->quality); @@ -483,6 +483,8 @@ static const VAAPIEncodeType vaapi_encode_type_mjpeg = { .configure = &vaapi_encode_mjpeg_configure, + .default_quality = 80, + .picture_params_size = sizeof(VAEncPictureParameterBufferJPEG), .init_picture_params = &vaapi_encode_mjpeg_init_picture_params, @@ -537,7 +539,6 @@ static const AVOption vaapi_encode_mjpeg_options[] = { }; static const AVCodecDefault vaapi_encode_mjpeg_defaults[] = { - { "global_quality", "80" }, { "b", "0" }, { NULL }, };