diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-02 04:10:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-02 04:10:51 +0200 |
| commit | 329559ae502a8d63bb04c0c3852caa48ac405ccc (patch) | |
| tree | 3a6ba34bcf97d1e08eba0181e81b634c4c2ad0db /libavcodec/options.c | |
| parent | 0b3a88fe1585f9d5d64da89417c0f8cc6788526a (diff) | |
| download | ffmpeg-329559ae502a8d63bb04c0c3852caa48ac405ccc.tar.gz | |
Revert "lavc: remove FF_API_RATE_EMU cruft"
This reverts commit 694c142434f1b775c93cb2586eebf7ddd5ef6aa8.
Diffstat (limited to 'libavcodec/options.c')
| -rw-r--r-- | libavcodec/options.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index c8220e43b3..3117bbe1b5 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -105,6 +105,9 @@ static const AVOption options[]={ {"extradata_size", NULL, OFFSET(extradata_size), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, {"time_base", NULL, OFFSET(time_base), FF_OPT_TYPE_RATIONAL, DEFAULT, INT_MIN, INT_MAX}, {"g", "set the group of picture size", OFFSET(gop_size), FF_OPT_TYPE_INT, 12, INT_MIN, INT_MAX, V|E}, +#if FF_API_RATE_EMU +{"rate_emu", "frame rate emulation", OFFSET(rate_emu), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, +#endif {"ar", "set audio sampling rate (in Hz)", OFFSET(sample_rate), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, {"ac", "set number of audio channels", OFFSET(channels), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, {"cutoff", "set cutoff bandwidth", OFFSET(cutoff), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, A|E}, |