diff options
| author | Michael Niedermayer <[email protected]> | 2011-08-22 14:06:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2011-08-22 15:00:53 +0200 |
| commit | 124deea1a0ccc4296cc6021231a7e6fbf336ff3a (patch) | |
| tree | 95db44e4e9ed969674f9dbb194a999c8150a1e03 /libavcodec/options.c | |
| parent | aeba058340ec47a10049c9cefb7ca8d500047b31 (diff) | |
| parent | ae60927aefe7a9debc285451b2badf1b8eb5ab22 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx264: only use ABR mode when the user explicitly set bitrate.
libx264: use medium preset by default.
mp2 encoder: make 128k the default bitrate.
movenc: use libx264 by default when possible for mov, mp4 and psp
avienc: saner default audio codec.
matroskaenc: saner default codecs.
avplay: add examples of how to specify size/pixel format through private options
lavc: add A|E|D flags to "ac" and "ar" options
Conflicts:
doc/ffplay.texi
libavcodec/libx264.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/options.c')
| -rw-r--r-- | libavcodec/options.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index cb2cd7decb..99deac2f41 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -126,8 +126,8 @@ static const AVOption options[]={ {"extradata_size", NULL, OFFSET(extradata_size), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, {"time_base", NULL, OFFSET(time_base), FF_OPT_TYPE_RATIONAL, {.dbl = 0}, INT_MIN, INT_MAX}, {"g", "set the group of picture size", OFFSET(gop_size), FF_OPT_TYPE_INT, {.dbl = 12 }, INT_MIN, INT_MAX, V|E}, -{"ar", "set audio sampling rate (in Hz)", OFFSET(sample_rate), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, -{"ac", "set number of audio channels", OFFSET(channels), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, +{"ar", "set audio sampling rate (in Hz)", OFFSET(sample_rate), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, A|D|E}, +{"ac", "set number of audio channels", OFFSET(channels), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, A|D|E}, {"cutoff", "set cutoff bandwidth", OFFSET(cutoff), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, A|E}, {"frame_size", NULL, OFFSET(frame_size), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX, A|E}, {"frame_number", NULL, OFFSET(frame_number), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, INT_MIN, INT_MAX}, |