lavc: remove FF_API_MB_Q cruft

Anton Khirnov committed 15 years ago

Commit 6deae831 parent 694c1423 files · +0 −23Browse files

Unified · Split

3 files

@@ -1768,22 +1768,6 @@ typedef struct AVCodecContext { · 1767 unmodified lines
1768	*/	1768	*/
1769	uint64_t error[4];	1769	uint64_t error[4];
1770		1770
1771	#if FF_API_MB_Q
1772	/**
1773	* minimum MB quantizer
1774	* - encoding: unused
1775	* - decoding: unused
1776	*/
1777	attribute_deprecated int mb_qmin;
1778
1779	/**
1780	* maximum MB quantizer
1781	* - encoding: unused
1782	* - decoding: unused
1783	*/
1784	attribute_deprecated int mb_qmax;
1785	#endif
1786
1787	/**	1771	/**
1788	* motion estimation comparison function	1772	* motion estimation comparison function
1789	* - encoding: Set by user.	1773	* - encoding: Set by user.

 {"pf", "forward predicted MVs of P-frames", 0, FF_OPT_TYPE_CONST, FF_DEBUG_VIS_MV_P_FOR, INT_MIN, INT_MAX, V|D, "debug_mv"},
 {"bf", "forward predicted MVs of B-frames", 0, FF_OPT_TYPE_CONST, FF_DEBUG_VIS_MV_B_FOR, INT_MIN, INT_MAX, V|D, "debug_mv"},
 {"bb", "backward predicted MVs of B-frames", 0, FF_OPT_TYPE_CONST, FF_DEBUG_VIS_MV_B_BACK, INT_MIN, INT_MAX, V|D, "debug_mv"},
-#if FF_API_MB_Q
-{"mb_qmin", "obsolete, use qmin", OFFSET(mb_qmin), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
-{"mb_qmax", "obsolete, use qmax", OFFSET(mb_qmax), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
-#endif
 {"cmp", "full pel me compare function", OFFSET(me_cmp), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E, "cmp_func"},
 {"subcmp", "sub pel me compare function", OFFSET(me_sub_cmp), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E, "cmp_func"},
 {"mbcmp", "macroblock compare function", OFFSET(mb_cmp), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E, "cmp_func"},

 #ifndef FF_API_OLD_AUDIOCONVERT
 #define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 54)
 #endif
-#ifndef FF_API_MB_Q
-#define FF_API_MB_Q             (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
 #ifndef FF_API_ANTIALIAS_ALGO
 #define FF_API_ANTIALIAS_ALGO   (LIBAVCODEC_VERSION_MAJOR < 54)
 #endif

Keyboard shortcuts