diff options
| author | rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-31 02:44:54 +0000 |
|---|---|---|
| committer | rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-31 02:44:54 +0000 |
| commit | c0926ecd8e8a20b18412550f5ac6f7592f182dbb (patch) | |
| tree | 80ff686b54accbf0c49ccf567cca6428b7bc05f8 | |
| parent | 6c417510ba974644fa81a672fad6d253f3204c23 (diff) | |
| download | mpv-c0926ecd8e8a20b18412550f5ac6f7592f182dbb.tar.bz2 mpv-c0926ecd8e8a20b18412550f5ac6f7592f182dbb.tar.xz | |
Fix build with shared libavutil. Approved by Diego.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21794 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | fmt-conversion.h | 4 | ||||
| -rw-r--r-- | libmpcodecs/vf_sab.c | 4 | ||||
| -rw-r--r-- | libmpcodecs/vf_smartblur.c | 4 | ||||
| -rw-r--r-- | spudec.c | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/fmt-conversion.h b/fmt-conversion.h index 0103365e8b..dfacd94986 100644 --- 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) diff --git a/libmpcodecs/vf_sab.c b/libmpcodecs/vf_sab.c index 7bf2783be1..dcd45647e2 100644 --- 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" diff --git a/libmpcodecs/vf_smartblur.c b/libmpcodecs/vf_smartblur.c index ba9b5a19bb..1d1a3893b1 100644 --- 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" @@ -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)) |