Remove libmpeg2 #define remnants

bc4620e5 · Diego Biurrun · c1ef30a6 · bc4620e5 · bc4620e5
Commit bc4620e5 authored Oct 11, 2012 by Diego Biurrun
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

avcodec.h libavcodec/avcodec.h +2 -0

version.h libavcodec/version.h +3 -0

No files found.
--- 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

--- 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 */