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/version.h | |
| parent | db23d5de27187dd8f2ec5c6dfd98a8a363b0fda5 (diff) | |
| parent | 93af2734ee609133eaeca28329d7f13241dd411f (diff) | |
| download | ffmpeg-streaming-5f61e09a8f28af45d7db1f5e7767d14322255f49.zip ffmpeg-streaming-5f61e09a8f28af45d7db1f5e7767d14322255f49.tar.gz | |
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/version.h')
| -rw-r--r-- | libavcodec/version.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index d22ff49..0bc8709 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -103,5 +103,8 @@ #ifndef FF_API_MMI #define FF_API_MMI (LIBAVCODEC_VERSION_MAJOR < 55) #endif +#ifndef FF_API_IDCT +#define FF_API_IDCT (LIBAVCODEC_VERSION_MAJOR < 55) +#endif #endif /* AVCODEC_VERSION_H */ |
