diff options
| -rw-r--r-- | doc/APIchanges | 4 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 5 | ||||
| -rw-r--r-- | libavcodec/version.h | 5 | ||||
| -rw-r--r-- | libavcodec/x86/idct_sse2_xvid.c | 2 | ||||
| -rw-r--r-- | libavcodec/xvididct.c | 2 |
6 files changed, 17 insertions, 4 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 1d4f07fa17..42527863cd 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,10 @@ libavutil: 2013-12-xx API changes, most recent first: +2014-08-xx - xxxxxxx - lavc 55.57.4 - avcodec.h + Deprecate FF_IDCT_XVIDMMX define and xvidmmx idct option. + Replaced by FF_IDCT_XVID and xvid respectively. + 2014-08-xx - xxxxxxx - lsws 2.1.3 - swscale.h sws_getCachedContext is not going to be removed in the future. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0cc81749b0..93aad35d33 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2478,7 +2478,10 @@ typedef struct AVCodecContext { #if FF_API_UNUSED_MEMBERS #define FF_IDCT_IPP 13 #endif /* FF_API_UNUSED_MEMBERS */ +#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_SIMPLEARMV6 17 #if FF_API_ARCH_SPARC diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 61cde0ff27..cf1f20a9fc 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -214,7 +214,10 @@ static const AVOption avcodec_options[] = { #if FF_API_UNUSED_MEMBERS {"ipp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_IPP }, INT_MIN, INT_MAX, V|E|D, "idct"}, #endif /* FF_API_UNUSED_MEMBERS */ -{"xvidmmx", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_XVIDMMX }, 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"}, {"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"}, diff --git a/libavcodec/version.h b/libavcodec/version.h index e087da39d7..41e9ff635c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 57 -#define LIBAVCODEC_VERSION_MICRO 3 +#define LIBAVCODEC_VERSION_MICRO 4 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -132,6 +132,9 @@ #ifndef FF_API_UNUSED_MEMBERS #define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_IDCT_XVIDMMX +#define FF_API_IDCT_XVIDMMX (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #ifndef FF_API_INPUT_PRESERVED #define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 57) #endif diff --git a/libavcodec/x86/idct_sse2_xvid.c b/libavcodec/x86/idct_sse2_xvid.c index aadeb122c6..49149ea723 100644 --- a/libavcodec/x86/idct_sse2_xvid.c +++ b/libavcodec/x86/idct_sse2_xvid.c @@ -48,7 +48,7 @@ /** * @file - * @brief SSE2 idct compatible with xvidmmx + * @brief SSE2 IDCT compatible with the Xvid IDCT */ #define X8(x) x,x,x,x,x,x,x,x diff --git a/libavcodec/xvididct.c b/libavcodec/xvididct.c index 7e8edc2462..9d38662037 100644 --- a/libavcodec/xvididct.c +++ b/libavcodec/xvididct.c @@ -28,7 +28,7 @@ av_cold void ff_xvididct_init(IDCTDSPContext *c, AVCodecContext *avctx) if (high_bit_depth || !(avctx->idct_algo == FF_IDCT_AUTO || - avctx->idct_algo == FF_IDCT_XVIDMMX)) + avctx->idct_algo == FF_IDCT_XVID)) return; if (ARCH_X86) |