diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 12:11:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-09 12:11:13 +0200 |
| commit | 3841f2ae665d527a7c8b3c226925995256adb917 (patch) | |
| tree | 62a2f32ee938ff94386dfe6d5771d1d05d40f165 /libavcodec | |
| parent | 64d029de41ed556b765df50c7080b06fd5a86417 (diff) | |
| parent | d35b94fbabd8beb5d566c0b5d01688aff62c3b36 (diff) | |
Merge commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36'
* commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36':
avcodec: Rename xvidmmx IDCT to xvid
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 |
5 files changed, 13 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7d10d3d0f0..3b6a75093e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2678,7 +2678,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 37382a5068..1c73aff28f 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -223,7 +223,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"}, {"simpleauto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_IDCT_SIMPLEAUTO }, INT_MIN, INT_MAX, V|E|D, "idct"}, {"slice_count", NULL, OFFSET(slice_count), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, diff --git a/libavcodec/version.h b/libavcodec/version.h index a44826bb03..3f64053264 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 73 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -153,6 +153,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 ce2abe4101..3af2ebbea3 100644 --- a/libavcodec/x86/idct_sse2_xvid.c +++ b/libavcodec/x86/idct_sse2_xvid.c @@ -47,7 +47,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 0c61fb5312..8645af439a 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->lowres || !(avctx->idct_algo == FF_IDCT_AUTO || - avctx->idct_algo == FF_IDCT_XVIDMMX)) + avctx->idct_algo == FF_IDCT_XVID)) return; if (ARCH_X86) |