Revision 4a49d2d5

View differences:

libavcodec/avcodec.h
1818 1818
     */
1819 1819
    uint64_t error[4];
1820 1820

  
1821
#if FF_API_MB_Q
1821 1822
    /**
1822 1823
     * minimum MB quantizer
1823 1824
     * - encoding: unused
1824 1825
     * - decoding: unused
1825 1826
     */
1826
    int mb_qmin;
1827
    attribute_deprecated int mb_qmin;
1827 1828

  
1828 1829
    /**
1829 1830
     * maximum MB quantizer
1830 1831
     * - encoding: unused
1831 1832
     * - decoding: unused
1832 1833
     */
1833
    int mb_qmax;
1834
    attribute_deprecated int mb_qmax;
1835
#endif
1834 1836

  
1835 1837
    /**
1836 1838
     * motion estimation comparison function
libavcodec/options.c
259 259
{"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"},
260 260
{"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"},
261 261
{"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"},
262
#if FF_API_MB_Q
262 263
{"mb_qmin", "obsolete, use qmin", OFFSET(mb_qmin), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
263 264
{"mb_qmax", "obsolete, use qmax", OFFSET(mb_qmax), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
265
#endif
264 266
{"cmp", "full pel me compare function", OFFSET(me_cmp), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E, "cmp_func"},
265 267
{"subcmp", "sub pel me compare function", OFFSET(me_sub_cmp), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E, "cmp_func"},
266 268
{"mbcmp", "macroblock compare function", OFFSET(mb_cmp), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E, "cmp_func"},
libavcodec/version.h
77 77
#ifndef FF_API_RATE_EMU
78 78
#define FF_API_RATE_EMU         (LIBAVCODEC_VERSION_MAJOR < 53)
79 79
#endif
80
#ifndef FF_API_MB_Q
81
#define FF_API_MB_Q             (LIBAVCODEC_VERSION_MAJOR < 53)
82
#endif
80 83

  
81 84
#endif /* AVCODEC_VERSION_H */

Also available in: Unified diff