DllAvUtil: Drop libav hacks and move them to libav_hacks.h.

xbmc · Aug 6, 2013 · cbc8616 · cbc8616
1 parent cb827df
commit cbc8616
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/lib/DllAvUtil.h b/lib/DllAvUtil.h
@@ -62,14 +62,7 @@ extern "C" {
 #endif
 }
 
-#if LIBAVUTIL_VERSION_MICRO >= 100
-  #define LIBAVUTIL_FROM_FFMPEG
-#else
-  #define LIBAVUTIL_FROM_LIBAV
-#endif
-
-#if (defined LIBAVUTIL_FROM_FFMPEG && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,29,100)) || \
-    (defined LIBAVUTIL_FROM_LIBAV  && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,8,0))
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,29,100)
 #define AVFRAME_IN_LAVU
 #endif
 

diff --git a/lib/xbmc-libav-hacks/libav_hacks.h b/lib/xbmc-libav-hacks/libav_hacks.h
@@ -37,6 +37,8 @@
 
 // libavutil
 
+#define AVFRAME_IN_LAVU
+
 #define AV_CODEC_ID_OTF AV_CODEC_ID_TTF
 
 AVDictionary *av_frame_get_metadata       (const AVFrame *frame);