qscale types and maximum number of bframes deprecated in 10/2013. Negative linesizes deprecated in 11/2013. xvidmmx deprecated in 08/2014.tags/n4.0
@@ -730,13 +730,6 @@ typedef struct RcOverride{ | |||||
float quality_factor; | float quality_factor; | ||||
} RcOverride; | } RcOverride; | ||||
#if FF_API_MAX_BFRAMES | |||||
/** | |||||
* @deprecated there is no libavcodec-wide limit on the number of B-frames | |||||
*/ | |||||
#define FF_MAX_B_FRAMES 16 | |||||
#endif | |||||
/* encoding support | /* encoding support | ||||
These flags can be passed in AVCodecContext.flags before initialization. | These flags can be passed in AVCodecContext.flags before initialization. | ||||
Note: Not everything is supported yet. | Note: Not everything is supported yet. | ||||
@@ -1057,12 +1050,6 @@ typedef struct RcOverride{ | |||||
* Codec should fill in channel configuration and samplerate instead of container | * Codec should fill in channel configuration and samplerate instead of container | ||||
*/ | */ | ||||
#define CODEC_CAP_CHANNEL_CONF 0x0400 | #define CODEC_CAP_CHANNEL_CONF 0x0400 | ||||
#if FF_API_NEG_LINESIZES | |||||
/** | |||||
* @deprecated no codecs use this capability | |||||
*/ | |||||
#define CODEC_CAP_NEG_LINESIZES 0x0800 | |||||
#endif | |||||
/** | /** | ||||
* Codec supports frame-level multithreading. | * Codec supports frame-level multithreading. | ||||
*/ | */ | ||||
@@ -1178,13 +1165,6 @@ typedef struct AVCPBProperties { | |||||
uint64_t vbv_delay; | uint64_t vbv_delay; | ||||
} AVCPBProperties; | } AVCPBProperties; | ||||
#if FF_API_QSCALE_TYPE | |||||
#define FF_QSCALE_TYPE_MPEG1 0 | |||||
#define FF_QSCALE_TYPE_MPEG2 1 | |||||
#define FF_QSCALE_TYPE_H264 2 | |||||
#define FF_QSCALE_TYPE_VP56 3 | |||||
#endif | |||||
/** | /** | ||||
* The decoder will keep a reference to the frame and may reuse it later. | * The decoder will keep a reference to the frame and may reuse it later. | ||||
*/ | */ | ||||
@@ -2722,9 +2702,6 @@ typedef struct AVCodecContext { | |||||
#define FF_IDCT_IPP 13 | #define FF_IDCT_IPP 13 | ||||
#endif /* FF_API_UNUSED_MEMBERS */ | #endif /* FF_API_UNUSED_MEMBERS */ | ||||
#define FF_IDCT_XVID 14 | #define FF_IDCT_XVID 14 | ||||
#if FF_API_IDCT_XVIDMMX | |||||
#define FF_IDCT_XVIDMMX 14 | |||||
#endif /* FF_API_IDCT_XVIDMMX */ | |||||
#define FF_IDCT_SIMPLEARMV5TE 16 | #define FF_IDCT_SIMPLEARMV5TE 16 | ||||
#define FF_IDCT_SIMPLEARMV6 17 | #define FF_IDCT_SIMPLEARMV6 17 | ||||
#define FF_IDCT_FAAN 20 | #define FF_IDCT_FAAN 20 | ||||
@@ -213,9 +213,6 @@ static const AVOption avcodec_options[] = { | |||||
{"ipp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_IPP }, INT_MIN, INT_MAX, V|E|D, "idct"}, | {"ipp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_IPP }, INT_MIN, INT_MAX, V|E|D, "idct"}, | ||||
#endif /* FF_API_UNUSED_MEMBERS */ | #endif /* FF_API_UNUSED_MEMBERS */ | ||||
{"xvid", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVID }, INT_MIN, INT_MAX, V|E|D, "idct"}, | {"xvid", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVID }, INT_MIN, INT_MAX, V|E|D, "idct"}, | ||||
#if FF_API_IDCT_XVIDMMX | |||||
{"xvidmmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVID }, INT_MIN, INT_MAX, V|E|D, "idct"}, | |||||
#endif /* FF_API_IDCT_XVIDMMX */ | |||||
{"faani", "floating point AAN IDCT", 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_FAAN }, INT_MIN, INT_MAX, V|D|E, "idct"}, | {"faani", "floating point AAN IDCT", 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_FAAN }, INT_MIN, INT_MAX, V|D|E, "idct"}, | ||||
{"slice_count", NULL, OFFSET(slice_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, | {"slice_count", NULL, OFFSET(slice_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, | ||||
{"ec", "set error concealment strategy", OFFSET(error_concealment), AV_OPT_TYPE_FLAGS, {.i64 = 3 }, INT_MIN, INT_MAX, V|D, "ec"}, | {"ec", "set error concealment strategy", OFFSET(error_concealment), AV_OPT_TYPE_FLAGS, {.i64 = 3 }, INT_MIN, INT_MAX, V|D, "ec"}, | ||||
@@ -47,30 +47,18 @@ | |||||
* the public API and may change, break or disappear at any time. | * the public API and may change, break or disappear at any time. | ||||
*/ | */ | ||||
#ifndef FF_API_QSCALE_TYPE | |||||
#define FF_API_QSCALE_TYPE (LIBAVCODEC_VERSION_MAJOR < 58) | |||||
#endif | |||||
#ifndef FF_API_MB_TYPE | #ifndef FF_API_MB_TYPE | ||||
#define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 58) | #define FF_API_MB_TYPE (LIBAVCODEC_VERSION_MAJOR < 58) | ||||
#endif | #endif | ||||
#ifndef FF_API_MAX_BFRAMES | |||||
#define FF_API_MAX_BFRAMES (LIBAVCODEC_VERSION_MAJOR < 58) | |||||
#endif | |||||
#ifndef FF_API_FAST_MALLOC | #ifndef FF_API_FAST_MALLOC | ||||
#define FF_API_FAST_MALLOC (LIBAVCODEC_VERSION_MAJOR < 58) | #define FF_API_FAST_MALLOC (LIBAVCODEC_VERSION_MAJOR < 58) | ||||
#endif | #endif | ||||
#ifndef FF_API_NEG_LINESIZES | |||||
#define FF_API_NEG_LINESIZES (LIBAVCODEC_VERSION_MAJOR < 58) | |||||
#endif | |||||
#ifndef FF_API_EMU_EDGE | #ifndef FF_API_EMU_EDGE | ||||
#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 58) | #define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 58) | ||||
#endif | #endif | ||||
#ifndef FF_API_UNUSED_MEMBERS | #ifndef FF_API_UNUSED_MEMBERS | ||||
#define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 58) | #define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 58) | ||||
#endif | #endif | ||||
#ifndef FF_API_IDCT_XVIDMMX | |||||
#define FF_API_IDCT_XVIDMMX (LIBAVCODEC_VERSION_MAJOR < 58) | |||||
#endif | |||||
#ifndef FF_API_INPUT_PRESERVED | #ifndef FF_API_INPUT_PRESERVED | ||||
#define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 58) | #define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 58) | ||||
#endif | #endif | ||||