Mercurial > mplayer.hg
changeset 21778:bf1fbe97cc40
Fix build with shared libavutil. Approved by Diego.
| author | rathann |
|---|---|
| date | Sun, 31 Dec 2006 02:44:54 +0000 |
| parents | 3af036ae3c75 |
| children | 2158c95b71f6 |
| files | fmt-conversion.h libmpcodecs/vf_sab.c libmpcodecs/vf_smartblur.c spudec.c |
| diffstat | 4 files changed, 16 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/fmt-conversion.h Sat Dec 30 22:43:12 2006 +0000 +++ b/fmt-conversion.h Sun Dec 31 02:44:54 2006 +0000 @@ -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 Sat Dec 30 22:43:12 2006 +0000 +++ b/libmpcodecs/vf_sab.c Sun Dec 31 02:44:54 2006 +0000 @@ -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 Sat Dec 30 22:43:12 2006 +0000 +++ b/libmpcodecs/vf_smartblur.c Sun Dec 31 02:44:54 2006 +0000 @@ -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 Sat Dec 30 22:43:12 2006 +0000 +++ b/spudec.c Sun Dec 31 02:44:54 2006 +0000 @@ -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))