diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-02-28 18:52:30 -0500 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-02-29 14:44:15 -0500 |
| commit | 182d4f1f3855460ee8634ea052f33332cf9d174e (patch) | |
| tree | e13aeb15a6ddb3075022473e878889879a15e8e3 /libavcodec | |
| parent | eb35ef2932e42d9b203a8bf9e5dba6f1c666ce1e (diff) | |
| download | ffmpeg-182d4f1f3855460ee8634ea052f33332cf9d174e.tar.gz | |
libvorbis: fix use of minrate/maxrate AVOptions
- enable the options for audio encoding
- properly check for user-set maxrate
- use correct calling order in vorbis_encode_setup_managed()
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libvorbis.c | 6 | ||||
| -rw-r--r-- | libavcodec/options.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/libvorbis.c b/libavcodec/libvorbis.c index e519a1dbb8..030da2a6d5 100644 --- a/libavcodec/libvorbis.c +++ b/libavcodec/libvorbis.c @@ -93,12 +93,12 @@ static av_cold int oggvorbis_init_encoder(vorbis_info *vi, goto error; } else { int minrate = avctx->rc_min_rate > 0 ? avctx->rc_min_rate : -1; - int maxrate = avctx->rc_min_rate > 0 ? avctx->rc_max_rate : -1; + int maxrate = avctx->rc_max_rate > 0 ? avctx->rc_max_rate : -1; /* average bitrate */ if ((ret = vorbis_encode_setup_managed(vi, avctx->channels, - avctx->sample_rate, minrate, - avctx->bit_rate, maxrate))) + avctx->sample_rate, maxrate, + avctx->bit_rate, minrate))) goto error; /* variable bitrate by estimate, disable slow rate management */ diff --git a/libavcodec/options.c b/libavcodec/options.c index 288c75437a..d25b64aee8 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -195,8 +195,8 @@ static const AVOption options[]={ {"rc_qmod_freq", "experimental quantizer modulation", OFFSET(rc_qmod_freq), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"rc_override_count", NULL, OFFSET(rc_override_count), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, {"rc_eq", "set rate control equation", OFFSET(rc_eq), AV_OPT_TYPE_STRING, {.str = NULL}, CHAR_MIN, CHAR_MAX, V|E}, -{"maxrate", "set max video bitrate tolerance (in bits/s)", OFFSET(rc_max_rate), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, -{"minrate", "set min video bitrate tolerance (in bits/s)", OFFSET(rc_min_rate), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E}, +{"maxrate", "set max bitrate tolerance (in bits/s)", OFFSET(rc_max_rate), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|A|E}, +{"minrate", "set min bitrate tolerance (in bits/s)", OFFSET(rc_min_rate), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|A|E}, {"bufsize", "set ratecontrol buffer size (in bits)", OFFSET(rc_buffer_size), AV_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, A|V|E}, {"rc_buf_aggressivity", "currently useless", OFFSET(rc_buffer_aggressivity), AV_OPT_TYPE_FLOAT, {.dbl = 1.0 }, -FLT_MAX, FLT_MAX, V|E}, {"i_qfactor", "qp factor between P and I frames", OFFSET(i_quant_factor), AV_OPT_TYPE_FLOAT, {.dbl = -0.8 }, -FLT_MAX, FLT_MAX, V|E}, |