From dc0c026ce054a96cdd4093237031ca63048a7393 Mon Sep 17 00:00:00 2001
From: Nicolay Korslund <korslund@gmail.com>
Date: Fri, 13 Aug 2010 19:27:45 +0200
Subject: [PATCH] Attempting to work around ffmpeg's inconsistent include path
 nonsense.

---
 sound/sources/ffmpeg_source.hpp | 4 ++--
 sound/tests/Makefile            | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sound/sources/ffmpeg_source.hpp b/sound/sources/ffmpeg_source.hpp
index 5bb478d74..d422b9809 100644
--- a/sound/sources/ffmpeg_source.hpp
+++ b/sound/sources/ffmpeg_source.hpp
@@ -7,8 +7,8 @@
 
 extern "C"
 {
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
+#include <avcodec.h>
+#include <avformat.h>
 }
 
 namespace Mangle {
diff --git a/sound/tests/Makefile b/sound/tests/Makefile
index cb647db73..39b17be18 100644
--- a/sound/tests/Makefile
+++ b/sound/tests/Makefile
@@ -3,6 +3,7 @@ GCC=g++ -I../ -Wall
 all: audiere_source_test ffmpeg_source_test openal_output_test openal_audiere_test openal_ffmpeg_test
 
 L_FFMPEG=$(shell pkg-config --libs libavcodec libavformat)
+I_FFMPEG=-I/usr/include/libavcodec -I/usr/include/libavformat
 L_OPENAL=$(shell pkg-config --libs openal)
 L_AUDIERE=-laudiere
 
@@ -10,7 +11,7 @@ openal_audiere_test: openal_audiere_test.cpp ../sources/audiere_source.cpp ../ou
 	$(GCC) $^ -o $@ $(L_AUDIERE) $(L_OPENAL)
 
 openal_ffmpeg_test: openal_ffmpeg_test.cpp ../sources/ffmpeg_source.cpp ../outputs/openal_out.cpp
-	$(GCC) $^ -o $@ $(L_FFMPEG) $(L_OPENAL)
+	$(GCC) $^ -o $@ $(L_FFMPEG) $(L_OPENAL) $(I_FFMPEG)
 
 openal_output_test: openal_output_test.cpp ../outputs/openal_out.cpp
 	$(GCC) $^ -o $@ $(L_OPENAL)
@@ -19,7 +20,7 @@ audiere_source_test: audiere_source_test.cpp ../sources/audiere_source.cpp ../..
 	$(GCC) $^ -o $@ $(L_AUDIERE)
 
 ffmpeg_source_test: ffmpeg_source_test.cpp ../sources/ffmpeg_source.cpp
-	$(GCC) $^ -o $@ $(L_FFMPEG)
+	$(GCC) $^ -o $@ $(L_FFMPEG) $(I_FFMPEG)
 
 clean:
 	rm *_test