lavc: remove FF_API_RATE_EMU cruft

Anton Khirnov committed 15 years ago

Commit 694c1421 parent e7021c03 files · +0 −16Browse files

Unified · Split

3 files

@@ -1203,16 +1203,6 @@ typedef struct AVCodecContext { · 1202 unmodified lines
1203	*/	1203	*/
1204	enum PixelFormat pix_fmt;	1204	enum PixelFormat pix_fmt;
1205		1205
1206	#if FF_API_RATE_EMU
1207	/**
1208	* Frame rate emulation. If not zero, the lower layer (i.e. format handler)
1209	* has to read frames at native frame rate.
1210	* - encoding: Set by user.
1211	* - decoding: unused
1212	*/
1213	attribute_deprecated int rate_emu;
1214	#endif
1215
1216	/**	1206	/**
1217	* If non NULL, 'draw_horiz_band' is called by the libavcodec	1207	* If non NULL, 'draw_horiz_band' is called by the libavcodec
1218	* decoder to draw a horizontal band. It improves cache usage. Not	1208	* decoder to draw a horizontal band. It improves cache usage. Not

 {"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},

 #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

Keyboard shortcuts