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/avcodec.h | |
| parent | 64d029de41ed556b765df50c7080b06fd5a86417 (diff) | |
| parent | d35b94fbabd8beb5d566c0b5d01688aff62c3b36 (diff) | |
| download | ffmpeg-3841f2ae665d527a7c8b3c226925995256adb917.tar.gz | |
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/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 3 |
1 files changed, 3 insertions, 0 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 |