Commit 41da4f8c authored by Kagami Hiiragi's avatar Kagami Hiiragi Committed by James Zern

lavc/libvpxenc: fix -auto-alt-ref option type

vp9_cx_iface actually allows values in range [0..2].
This fixes ticket #5894.
Signed-off-by: 's avatarKagami Hiiragi <kagami@genshiken.org>
Signed-off-by: 's avatarJames Zern <jzern@google.com>
parent c8a6eb58
...@@ -621,7 +621,8 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -621,7 +621,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (ctx->flags & VP8F_AUTO_ALT_REF) if (ctx->flags & VP8F_AUTO_ALT_REF)
ctx->auto_alt_ref = 1; ctx->auto_alt_ref = 1;
if (ctx->auto_alt_ref >= 0) if (ctx->auto_alt_ref >= 0)
codecctl_int(avctx, VP8E_SET_ENABLEAUTOALTREF, ctx->auto_alt_ref); codecctl_int(avctx, VP8E_SET_ENABLEAUTOALTREF,
avctx->codec_id == AV_CODEC_ID_VP8 ? !!ctx->auto_alt_ref : ctx->auto_alt_ref);
if (ctx->arnr_max_frames >= 0) if (ctx->arnr_max_frames >= 0)
codecctl_int(avctx, VP8E_SET_ARNR_MAXFRAMES, ctx->arnr_max_frames); codecctl_int(avctx, VP8E_SET_ARNR_MAXFRAMES, ctx->arnr_max_frames);
if (ctx->arnr_strength >= 0) if (ctx->arnr_strength >= 0)
...@@ -1025,7 +1026,7 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, ...@@ -1025,7 +1026,7 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt,
#define COMMON_OPTIONS \ #define COMMON_OPTIONS \
{ "auto-alt-ref", "Enable use of alternate reference " \ { "auto-alt-ref", "Enable use of alternate reference " \
"frames (2-pass only)", OFFSET(auto_alt_ref), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, \ "frames (2-pass only)", OFFSET(auto_alt_ref), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 2, VE}, \
{ "lag-in-frames", "Number of frames to look ahead for " \ { "lag-in-frames", "Number of frames to look ahead for " \
"alternate reference frame selection", OFFSET(lag_in_frames), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, VE}, \ "alternate reference frame selection", OFFSET(lag_in_frames), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, VE}, \
{ "arnr-maxframes", "altref noise reduction max frame count", OFFSET(arnr_max_frames), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, VE}, \ { "arnr-maxframes", "altref noise reduction max frame count", OFFSET(arnr_max_frames), AV_OPT_TYPE_INT, {.i64 = -1}, -1, INT_MAX, VE}, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment