[MPlayer-dev-eng] [PATCH] shared libavutil support

[Dominik 'Rathann' Mierzejewski]

Fixes build with shared libavutil.

I'll apply this tomorrow evening if there are no objections.

Regards,
R.

-- 
MPlayer developer and RPMs maintainer: http://mplayerhq.hu http://rpm.livna.org
There should be a science of discontent. People need hard times and
oppression to develop psychic muscles.
	-- from "Collected Sayings of Muad'Dib" by the Princess Irulan
-------------- next part --------------
Index: libmpcodecs/vf_sab.c
===================================================================
--- libmpcodecs/vf_sab.c	(revision 21776)
+++ libmpcodecs/vf_sab.c	(working copy)
@@ -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"
Index: libmpcodecs/vf_smartblur.c
===================================================================
--- libmpcodecs/vf_smartblur.c	(revision 21776)
+++ libmpcodecs/vf_smartblur.c	(working copy)
@@ -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"
Index: fmt-conversion.h
===================================================================
--- fmt-conversion.h	(revision 21776)
+++ fmt-conversion.h	(working copy)
@@ -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)
Index: spudec.c
===================================================================
--- spudec.c	(revision 21776)
+++ spudec.c	(working copy)
@@ -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))