From 86ee0f413dad209aa70e11af357f33856340b1f0 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Mon, 23 Jun 2008 22:07:39 +0100
Subject: Allow for <libavutil/base64.h> etc. Fixes build failures with some
 ffmpeg dev packages, e.g. from debian-multimedia.

---
 src/audio_dec/ff_dvdata.h        | 9 +++++++--
 src/audio_dec/xine_a52_decoder.c | 6 +++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'src/audio_dec')

diff --git a/src/audio_dec/ff_dvdata.h b/src/audio_dec/ff_dvdata.h
index fc99349d0..f1d7af260 100644
--- a/src/audio_dec/ff_dvdata.h
+++ b/src/audio_dec/ff_dvdata.h
@@ -27,8 +27,13 @@
 #ifndef FFMPEG_DVDATA_H
 #define FFMPEG_DVDATA_H
 
-#include <avcodec.h>
-#include <rational.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <avcodec.h>
+#  include <rational.h>
+#else
+#  include <libavcodec/avcodec.h>
+#  include <libavutil/rational.h>
+#endif
 
 /*
  * DVprofile is used to express the differences between various
diff --git a/src/audio_dec/xine_a52_decoder.c b/src/audio_dec/xine_a52_decoder.c
index 053980d17..98d3f1a9a 100644
--- a/src/audio_dec/xine_a52_decoder.c
+++ b/src/audio_dec/xine_a52_decoder.c
@@ -62,7 +62,11 @@
 #include <xine/buffer.h>
 #include <xine/xineutils.h>
 
-#include <crc.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <crc.h>
+#else
+#  include <libavutil/crc.h>
+#endif
 
 #undef DEBUG_A52
 #ifdef DEBUG_A52
-- 
cgit v1.2.3