diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-04-12 20:53:21 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-26 08:16:05 +0200 |
| commit | 694c142434f1b775c93cb2586eebf7ddd5ef6aa8 (patch) | |
| tree | 3406c8810b2dc38e858c3f8a7d905cab43c79fbc | |
| parent | e7021c0ed5d1265d5b4f0f01a01f840196a70415 (diff) | |
| download | android_external_ffmpeg-694c142434f1b775c93cb2586eebf7ddd5ef6aa8.tar.gz android_external_ffmpeg-694c142434f1b775c93cb2586eebf7ddd5ef6aa8.tar.bz2 android_external_ffmpeg-694c142434f1b775c93cb2586eebf7ddd5ef6aa8.zip | |
lavc: remove FF_API_RATE_EMU cruft
| -rw-r--r-- | libavcodec/avcodec.h | 10 | ||||
| -rw-r--r-- | libavcodec/options.c | 3 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 16 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c0f842ec7c..e8578a9327 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1203,16 +1203,6 @@ typedef struct AVCodecContext { */ enum PixelFormat pix_fmt; -#if FF_API_RATE_EMU - /** - * Frame rate emulation. If not zero, the lower layer (i.e. format handler) - * has to read frames at native frame rate. - * - encoding: Set by user. - * - decoding: unused - */ - attribute_deprecated int rate_emu; -#endif - /** * If non NULL, 'draw_horiz_band' is called by the libavcodec * decoder to draw a horizontal band. It improves cache usage. Not diff --git a/libavcodec/options.c b/libavcodec/options.c index 5d7534921e..d664d41aa8 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -105,9 +105,6 @@ 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}, diff --git a/libavcodec/version.h b/libavcodec/version.h index fee57b1815..90402ffff7 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -47,9 +47,6 @@ #ifndef FF_API_OLD_AUDIOCONVERT #define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 54) #endif -#ifndef FF_API_RATE_EMU -#define FF_API_RATE_EMU (LIBAVCODEC_VERSION_MAJOR < 53) -#endif #ifndef FF_API_MB_Q #define FF_API_MB_Q (LIBAVCODEC_VERSION_MAJOR < 53) #endif |