aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-10-11 16:35:48 +0200
committerDiego Biurrun <diego@biurrun.de>2012-10-12 20:56:54 +0200
commitbc4620e5d61a4dd9a1f654fadd281a172aab04be (patch)
treeabdac2ffd04ad69a90918bdf2229ca2fb80f88e4
parentc1ef30a6ba2cdc15147c4e80766e9bda629ffc1d (diff)
downloadffmpeg-bc4620e5d61a4dd9a1f654fadd281a172aab04be.tar.gz
Remove libmpeg2 #define remnants
-rw-r--r--libavcodec/avcodec.h2
-rw-r--r--libavcodec/version.h3
2 files changed, 5 insertions, 0 deletions
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 */