From bc4620e5d61a4dd9a1f654fadd281a172aab04be Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 11 Oct 2012 16:35:48 +0200 Subject: Remove libmpeg2 #define remnants --- libavcodec/avcodec.h | 2 ++ libavcodec/version.h | 3 +++ 2 files changed, 5 insertions(+) (limited to 'libavcodec') diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 223db9ca75..32a7dcb3ed 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2620,7 +2620,9 @@ typedef struct AVCodecContext { #define FF_IDCT_INT 1 #define FF_IDCT_SIMPLE 2 #define FF_IDCT_SIMPLEMMX 3 +#if FF_API_LIBMPEG2 #define FF_IDCT_LIBMPEG2MMX 4 +#endif #define FF_IDCT_MMI 5 #define FF_IDCT_ARM 7 #define FF_IDCT_ALTIVEC 8 diff --git a/libavcodec/version.h b/libavcodec/version.h index 5b2d7b99f7..b97439c91c 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -85,5 +85,8 @@ #ifndef FF_API_AVCODEC_RESAMPLE #define FF_API_AVCODEC_RESAMPLE (LIBAVCODEC_VERSION_MAJOR < 55) #endif +#ifndef FF_API_LIBMPEG2 +#define FF_API_LIBMPEG2 (LIBAVCODEC_VERSION_MAJOR < 55) +#endif #endif /* AVCODEC_VERSION_H */ -- cgit v1.2.3