diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 16:14:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 16:14:41 +0100 |
| commit | 5f61e09a8f28af45d7db1f5e7767d14322255f49 (patch) | |
| tree | df4e8ce30cb60c7fe5a559529dcd2a03bdc22afb /libavcodec/avcodec.h | |
| parent | db23d5de27187dd8f2ec5c6dfd98a8a363b0fda5 (diff) | |
| parent | 93af2734ee609133eaeca28329d7f13241dd411f (diff) | |
Merge commit '93af2734ee609133eaeca28329d7f13241dd411f'
* commit '93af2734ee609133eaeca28329d7f13241dd411f':
lavc: put FF_IDCT_{VP3,H264,CAVS,BINK,EA,WMV2} under FF_API_IDCT.
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 9367093265..c3b1b6ac6b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2890,20 +2890,22 @@ typedef struct AVCodecContext { #define FF_IDCT_ALTIVEC 8 #define FF_IDCT_SH4 9 #define FF_IDCT_SIMPLEARM 10 -#define FF_IDCT_H264 11 -#define FF_IDCT_VP3 12 #define FF_IDCT_IPP 13 #define FF_IDCT_XVIDMMX 14 -#define FF_IDCT_CAVS 15 #define FF_IDCT_SIMPLEARMV5TE 16 #define FF_IDCT_SIMPLEARMV6 17 #define FF_IDCT_SIMPLEVIS 18 -#define FF_IDCT_WMV2 19 #define FF_IDCT_FAAN 20 -#define FF_IDCT_EA 21 #define FF_IDCT_SIMPLENEON 22 #define FF_IDCT_SIMPLEALPHA 23 +#if FF_API_IDCT +#define FF_IDCT_H264 11 +#define FF_IDCT_VP3 12 +#define FF_IDCT_CAVS 15 +#define FF_IDCT_WMV2 19 +#define FF_IDCT_EA 21 #define FF_IDCT_BINK 24 +#endif #if FF_API_DSP_MASK /** |