From 567a45c982f7806344426cb5495e429ab80793a3 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Thu, 6 Mar 2008 23:03:53 +0000
Subject: Fix DXR3 build with internal/new ffmpeg.

---
 src/combined/ffmpeg/ffmpeg_encoder.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

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 */
-- 
cgit v1.2.3