diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-02 04:10:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-02 04:10:59 +0200 |
| commit | 8d8962ca3e95b1ce86ab505498e7cd3ec89fa996 (patch) | |
| tree | 75624db5b673798bcaa0fcd01c352c5ea74837c8 /libavcodec/options.c | |
| parent | 329559ae502a8d63bb04c0c3852caa48ac405ccc (diff) | |
| download | ffmpeg-8d8962ca3e95b1ce86ab505498e7cd3ec89fa996.tar.gz | |
Revert "lavc: remove FF_API_HURRY_UP cruft"
This reverts commit e7021c0ed5d1265d5b4f0f01a01f840196a70415.
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 3117bbe1b5..fae1164c9b 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -127,6 +127,9 @@ static const AVOption options[]={ {"rc_strategy", "ratecontrol method", OFFSET(rc_strategy), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"b_strategy", "strategy to choose between I/P/B-frames", OFFSET(b_frame_strategy), FF_OPT_TYPE_INT, 0, INT_MIN, INT_MAX, V|E}, {"wpredp", "weighted prediction analysis method", OFFSET(weighted_p_pred), FF_OPT_TYPE_INT, 0, INT_MIN, INT_MAX, V|E}, +#if FF_API_HURRY_UP +{"hurry_up", "deprecated, use skip_idct/skip_frame instead", OFFSET(hurry_up), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|D}, +#endif {"ps", "rtp payload size in bytes", OFFSET(rtp_payload_size), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"mv_bits", NULL, OFFSET(mv_bits), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, {"header_bits", NULL, OFFSET(header_bits), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, |