diff options
| author | Kagami Hiiragi <kagami@genshiken.org> | 2016-10-20 18:31:38 +0300 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2016-10-21 18:16:46 -0700 |
| commit | 41da4f8cb3a7ac6888dbe6a6bbe1a573a74062ff (patch) | |
| tree | 574ada2cfff335a2bfb4368d22e01ce8830644f4 /libavcodec/libvpxenc.c | |
| parent | c8a6eb58d7ebc9c1585bc450aa9e0358f6822df0 (diff) | |
| download | ffmpeg-41da4f8cb3a7ac6888dbe6a6bbe1a573a74062ff.tar.gz | |
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: Kagami Hiiragi <kagami@genshiken.org>
Signed-off-by: James Zern <jzern@google.com>
Diffstat (limited to 'libavcodec/libvpxenc.c')
| -rw-r--r-- | libavcodec/libvpxenc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 2db87f7f2a..68f25a4818 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -621,7 +621,8 @@ FF_ENABLE_DEPRECATION_WARNINGS if (ctx->flags & VP8F_AUTO_ALT_REF) ctx->auto_alt_ref = 1; 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) codecctl_int(avctx, VP8E_SET_ARNR_MAXFRAMES, ctx->arnr_max_frames); if (ctx->arnr_strength >= 0) @@ -1025,7 +1026,7 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, #define COMMON_OPTIONS \ { "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 " \ "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}, \ |