diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-06 21:21:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-06 23:52:20 +0200 |
| commit | 71da91e887d5412f22ed2a9a2cb9e875b5029f78 (patch) | |
| tree | 5ca3d786844b680aec21f472f7f7e864eafa4b97 /libavcodec | |
| parent | 5265e3e40fd20f1b53e192587280b1f9a2355c81 (diff) | |
| download | ffmpeg-71da91e887d5412f22ed2a9a2cb9e875b5029f78.tar.gz | |
avcodec/libvpxenc: update the ranges for "cpu_used" so it matches the "speed" alias
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libvpxenc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index b56c02d9ed..3dddffd88e 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -415,8 +415,7 @@ static av_cold int vpx_init(AVCodecContext *avctx, //codec control failures are currently treated only as warnings 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) ctx->auto_alt_ref = 1; if (ctx->auto_alt_ref >= 0) @@ -754,7 +753,7 @@ static int vp8_encode(AVCodecContext *avctx, AVPacket *pkt, #endif #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 " \ "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 " \ |