diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 13:51:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-18 13:52:06 +0200 |
| commit | 17a065cf204fb626b6940b1bc3df5d6ab9f4a468 (patch) | |
| tree | bfb481ba8df17aaf8bba25bdfcda02e1d8ad21c0 /libavcodec/options_table.h | |
| parent | 74128352047ee3fb075b0f69ab16047f70b45a42 (diff) | |
| parent | 946f95354ba76ef73c9b66889d86ab5fba4fb486 (diff) | |
| download | ffmpeg-17a065cf204fb626b6940b1bc3df5d6ab9f4a468.tar.gz | |
Merge commit '946f95354ba76ef73c9b66889d86ab5fba4fb486'
* commit '946f95354ba76ef73c9b66889d86ab5fba4fb486':
lavc: make rc_qmod_* into private options of mpegvideo encoders
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/options_table.h')
| -rw-r--r-- | libavcodec/options_table.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index a55b4cbfcd..797f6de781 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -176,9 +176,9 @@ static const AVOption avcodec_options[] = { {"mpeg_quant", "use MPEG quantizers instead of H.263", OFFSET(mpeg_quant), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, #if FF_API_MPV_OPT {"qsquish", "deprecated, use encoder private options instead", OFFSET(rc_qsquish), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, 0, 99, V|E}, +{"rc_qmod_amp", "deprecated, use encoder private options instead", OFFSET(rc_qmod_amp), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, -FLT_MAX, FLT_MAX, V|E}, +{"rc_qmod_freq", "deprecated, use encoder private options instead", OFFSET(rc_qmod_freq), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, #endif -{"rc_qmod_amp", "experimental quantizer modulation", OFFSET(rc_qmod_amp), AV_OPT_TYPE_FLOAT, {.dbl = DEFAULT }, -FLT_MAX, FLT_MAX, V|E}, -{"rc_qmod_freq", "experimental quantizer modulation", OFFSET(rc_qmod_freq), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, {"rc_override_count", NULL, OFFSET(rc_override_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, {"rc_eq", "Set rate control equation. When computing the expression, besides the standard functions " "defined in the section 'Expression Evaluation', the following functions are available: " |