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/version.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/version.h')
| -rw-r--r-- | libavcodec/version.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index cf8f6b52d8..0a2a9094f5 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -76,9 +76,6 @@ #ifndef FF_API_AVCODEC_RESAMPLE #define FF_API_AVCODEC_RESAMPLE (LIBAVCODEC_VERSION_MAJOR < 56) #endif -#ifndef FF_API_IDCT -#define FF_API_IDCT (LIBAVCODEC_VERSION_MAJOR < 55) -#endif #ifndef FF_API_DEINTERLACE #define FF_API_DEINTERLACE (LIBAVCODEC_VERSION_MAJOR < 56) #endif |