Commit 71da91e8 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/libvpxenc: update the ranges for "cpu_used" so it matches the "speed" alias

Reviewed-by: 's avatarJames Zern <jzern@google.com>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 5265e3e4
...@@ -415,7 +415,6 @@ static av_cold int vpx_init(AVCodecContext *avctx, ...@@ -415,7 +415,6 @@ static av_cold int vpx_init(AVCodecContext *avctx,
//codec control failures are currently treated only as warnings //codec control failures are currently treated only as warnings
av_log(avctx, AV_LOG_DEBUG, "vpx_codec_control\n"); av_log(avctx, AV_LOG_DEBUG, "vpx_codec_control\n");
if (ctx->cpu_used != INT_MIN)
codecctl_int(avctx, VP8E_SET_CPUUSED, ctx->cpu_used); codecctl_int(avctx, VP8E_SET_CPUUSED, ctx->cpu_used);
if (ctx->flags & VP8F_AUTO_ALT_REF) if (ctx->flags & VP8F_AUTO_ALT_REF)
ctx->auto_alt_ref = 1; ctx->auto_alt_ref = 1;
...@@ -754,7 +753,7 @@ static int vp8_encode(AVCodecContext *avctx, AVPacket *pkt, ...@@ -754,7 +753,7 @@ static int vp8_encode(AVCodecContext *avctx, AVPacket *pkt,
#endif #endif
#define COMMON_OPTIONS \ #define COMMON_OPTIONS \
{ "cpu-used", "Quality/Speed ratio modifier", OFFSET(cpu_used), AV_OPT_TYPE_INT, {.i64 = 1}, INT_MIN, INT_MAX, VE}, \ { "cpu-used", "Quality/Speed ratio modifier", OFFSET(cpu_used), AV_OPT_TYPE_INT, {.i64 = 1}, -16, 16, VE}, \
{ "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_INT, {.i64 = -1}, -1, 1, VE}, \ "frames (2-pass only)", OFFSET(auto_alt_ref), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 1, VE}, \
{ "lag-in-frames", "Number of frames to look ahead for " \ { "lag-in-frames", "Number of frames to look ahead for " \
......
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