diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:03:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:03:22 +0100 |
| commit | b13cd2d86763cddd754bab204b0893d7bf7e123b (patch) | |
| tree | 0474a2e55908ee79275f9061887f2a8b8521688f /libavcodec/avcodec.h | |
| parent | feccf2f6b747e433766464e8a8b215cbe70c5f27 (diff) | |
| parent | d6ed604cf4ca86ed345125b26eb5bdeea6d6bf68 (diff) | |
Merge commit 'd6ed604cf4ca86ed345125b26eb5bdeea6d6bf68'
* commit 'd6ed604cf4ca86ed345125b26eb5bdeea6d6bf68':
lavc: remove disabled FF_API_IDCT cruft
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 87129a5764..891620b3d8 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2521,14 +2521,6 @@ typedef struct AVCodecContext { #define FF_IDCT_FAAN 20 #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 /** * bits per sample/pixel from the demuxer (needed for huffyuv). |