From c414377fbfa2be0577381c80dd0171061e242905 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Sun, 2 Mar 2008 22:16:08 +0000
Subject: Fix compilation with older external ffmpeg. HAVE_FFMPEG_AVUTIL_H
 wasn't being defined, and there were some incorrect checks.

---
 src/libffmpeg/ff_dvaudio_decoder.c | 2 +-
 src/libffmpeg/ff_video_decoder.c   | 2 +-
 src/libffmpeg/ffmpeg_decoder.h     | 2 +-
 src/post/planar/pp.c               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/libffmpeg/ff_dvaudio_decoder.c b/src/libffmpeg/ff_dvaudio_decoder.c
index a394e6615..5106a402c 100644
--- a/src/libffmpeg/ff_dvaudio_decoder.c
+++ b/src/libffmpeg/ff_dvaudio_decoder.c
@@ -52,7 +52,7 @@
 #  undef uint64_t
 #endif
 
-#ifdef HAVE_FFMPEG_AVCODEC_H
+#ifdef HAVE_FFMPEG_AVUTIL_H
 #  include <avcodec.h>
 #else
 #  include <libavcodec/avcodec.h>
diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c
index d1d69416e..3d9c0225a 100644
--- a/src/libffmpeg/ff_video_decoder.c
+++ b/src/libffmpeg/ff_video_decoder.c
@@ -45,7 +45,7 @@
 #include "ffmpeg_decoder.h"
 #include "ff_mpeg_parser.h"
 
-#ifdef HAVE_FFMPEG_AVCODEC_H
+#ifdef HAVE_FFMPEG_AVUTIL_H
 #  include <postprocess.h>
 #else
 #  include <libpostproc/postprocess.h>
diff --git a/src/libffmpeg/ffmpeg_decoder.h b/src/libffmpeg/ffmpeg_decoder.h
index adf0908dd..6de9e8772 100644
--- a/src/libffmpeg/ffmpeg_decoder.h
+++ b/src/libffmpeg/ffmpeg_decoder.h
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_FFMPEG_AVCODEC_H
+#ifdef HAVE_FFMPEG_AVUTIL_H
 #  include <avcodec.h>
 #else
 #  include <libavcodec/avcodec.h>
diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c
index bc7cc1928..e658dadd0 100644
--- a/src/post/planar/pp.c
+++ b/src/post/planar/pp.c
@@ -25,7 +25,7 @@
 #include "xineutils.h"
 #include <pthread.h>
 
-#ifdef HAVE_FFMPEG_AVCODEC_H
+#ifdef HAVE_FFMPEG_AVUTIL_H
 #  include <postprocess.h>
 #else
 #  include <libpostproc/postprocess.h>
-- 
cgit v1.2.3