Fix build with shared libavutil. Approved by Diego.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21794 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 02:44:54 +00:00 · 2006-12-31 02:44:54 +00:00 · c0926ecd8e
parent 6c417510ba
commit c0926ecd8e
4 changed files with 16 additions and 0 deletions
--- a/fmt-conversion.h
+++ b/fmt-conversion.h
@ -1,4 +1,8 @@
+#ifdef USE_LIBAVUTIL_SO
+#include <ffmpeg/avutil.h>
+#else
 #include "avutil.h"
+#endif
 #include "img_format.h"

 enum PixelFormat imgfmt2pixfmt(int fmt)
--- a/libmpcodecs/vf_sab.c
+++ b/libmpcodecs/vf_sab.c
@ -29,7 +29,11 @@
 #include <malloc.h>
 #endif

+#ifdef USE_LIBAVUTIL_SO
+#include <ffmpeg/avutil.h>
+#else
 #include "avutil.h"
+#endif
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
--- a/libmpcodecs/vf_smartblur.c
+++ b/libmpcodecs/vf_smartblur.c
@ -29,7 +29,11 @@
 #include <malloc.h>
 #endif

+#ifdef USE_LIBAVUTIL_SO
+#include <ffmpeg/avutil.h>
+#else
 #include "avutil.h"
+#endif
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
--- a/spudec.c
+++ b/spudec.c
@ -23,7 +23,11 @@
 #include <math.h>
 #include "libvo/video_out.h"
 #include "spudec.h"
+#ifdef USE_LIBAVUTIL_SO
+#include <ffmpeg/avutil.h>
+#else
 #include "avutil.h"
+#endif
 #include "libswscale/swscale.h"

 #define MIN(a, b)	((a)<(b)?(a):(b))