[FFmpeg-cvslog] Remove libmpeg2 #define remnants

Diego Biurrun git at videolan.org
Sat Oct 13 15:07:03 CEST 2012


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Thu Oct 11 16:35:48 2012 +0200| [bc4620e5d61a4dd9a1f654fadd281a172aab04be] | committer: Diego Biurrun

Remove libmpeg2 #define remnants

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc4620e5d61a4dd9a1f654fadd281a172aab04be
---

 libavcodec/avcodec.h |    2 ++
 libavcodec/version.h |    3 +++
 2 files changed, 5 insertions(+)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 223db9c..32a7dcb 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 5b2d7b9..b97439c 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 */



More information about the ffmpeg-cvslog mailing list