[MPlayer-cvslog] r21794 - in trunk: fmt-conversion.h libmpcodecs/vf_sab.c libmpcodecs/vf_smartblur.c spudec.c

[rathann]

Author: rathann
Date: Sun Dec 31 03:44:54 2006
New Revision: 21794

Modified:
   trunk/fmt-conversion.h
   trunk/libmpcodecs/vf_sab.c
   trunk/libmpcodecs/vf_smartblur.c
   trunk/spudec.c

Log:
Fix build with shared libavutil. Approved by Diego.


Modified: trunk/fmt-conversion.h
==============================================================================
--- trunk/fmt-conversion.h	(original)
+++ trunk/fmt-conversion.h	Sun Dec 31 03:44:54 2006
@@ -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)

Modified: trunk/libmpcodecs/vf_sab.c
==============================================================================
--- trunk/libmpcodecs/vf_sab.c	(original)
+++ trunk/libmpcodecs/vf_sab.c	Sun Dec 31 03:44:54 2006
@@ -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"

Modified: trunk/libmpcodecs/vf_smartblur.c
==============================================================================
--- trunk/libmpcodecs/vf_smartblur.c	(original)
+++ trunk/libmpcodecs/vf_smartblur.c	Sun Dec 31 03:44:54 2006
@@ -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"

Modified: trunk/spudec.c
==============================================================================
--- trunk/spudec.c	(original)
+++ trunk/spudec.c	Sun Dec 31 03:44:54 2006
@@ -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))