summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-03-06 23:03:53 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-03-06 23:03:53 +0000
commit567a45c982f7806344426cb5495e429ab80793a3 (patch)
tree3e7166b259b13fb366f4adb38b4d905f86158042 /src
parent3d745bde9e0ad2f3097f3934562c85093eeaa2ff (diff)
downloadxine-lib-567a45c982f7806344426cb5495e429ab80793a3.tar.gz
xine-lib-567a45c982f7806344426cb5495e429ab80793a3.tar.bz2
Fix DXR3 build with internal/new ffmpeg.
Diffstat (limited to 'src')
-rw-r--r--src/combined/ffmpeg/ffmpeg_encoder.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/combined/ffmpeg/ffmpeg_encoder.c b/src/combined/ffmpeg/ffmpeg_encoder.c
index 7fe65c7fa..c1e3d2823 100644
--- a/src/combined/ffmpeg/ffmpeg_encoder.c
+++ b/src/combined/ffmpeg/ffmpeg_encoder.c
@@ -38,7 +38,11 @@
#include "video_out_dxr3.h"
-#include <avcodec.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+# include <avcodec.h>
+#else
+# include <libavcodec/avcodec.h>
+#endif
/* buffer size for encoded mpeg1 stream; will hold one intra frame
* at 640x480 typical sizes are <50 kB. 512 kB should be plenty */