diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-02 04:41:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-02 04:43:48 +0200 |
| commit | f8a4075eb83e6b55fc1185421365181b009516ba (patch) | |
| tree | 326bfe5227a94792b00054e25afe9de2ff67d0cb /libavcodec/options.c | |
| parent | 0a19b4b0bae772cac7f8341e94c319c96356ee69 (diff) | |
| parent | b036a7180cf1f4926084d2f5b7ede09a041f309b (diff) | |
| download | ffmpeg-f8a4075eb83e6b55fc1185421365181b009516ba.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: add video/audio/encoding flags to global_quality option
libvpxenc: use libvpx's own defaults for some parameters
vpxenc: add private options
Conflicts:
libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/options.c')
| -rw-r--r-- | libavcodec/options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index eb69904c10..3df64cd978 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -321,7 +321,7 @@ static const AVOption options[]={ {"pbias", "inter quant bias", OFFSET(inter_quant_bias), FF_OPT_TYPE_INT, {.dbl = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, V|E}, {"color_table_id", NULL, OFFSET(color_table_id), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, {"internal_buffer_count", NULL, OFFSET(internal_buffer_count), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, -{"global_quality", NULL, OFFSET(global_quality), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, +{"global_quality", NULL, OFFSET(global_quality), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|A|E}, {"coder", NULL, OFFSET(coder_type), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, V|E, "coder"}, {"vlc", "variable length coder / huffman coder", 0, FF_OPT_TYPE_CONST, {.dbl = FF_CODER_TYPE_VLC }, INT_MIN, INT_MAX, V|E, "coder"}, {"ac", "arithmetic coder", 0, FF_OPT_TYPE_CONST, {.dbl = FF_CODER_TYPE_AC }, INT_MIN, INT_MAX, V|E, "coder"}, |