From 9a48002025b266a6767e8c8ea26de3c43dbc5749 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Tue, 20 Mar 2012 14:13:58 -0700
Subject: [PATCH] Fix compilation of the FFmpeg decoder

---
 CMakeLists.txt                         | 15 +++++++++------
 apps/openmw/mwsound/ffmpeg_decoder.hpp |  6 ++++++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97cb33685..d836cccaa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,19 +126,22 @@ set(OPENMW_LIBS ${MANGLE_ALL} ${OENGINE_ALL})
 set(OPENMW_LIBS_HEADER)
 
 # Sound setup
+set(SOUND_INPUT_INCLUDES "")
+set(SOUND_INPUT_LIBRARY "")
+set(SOUND_DEFINE "")
 if (USE_FFMPEG)
     find_package(FFMPEG REQUIRED)
-    set(SOUND_INPUT_INCLUDES ${FFMPEG_INCLUDE_DIR})
-    set(SOUND_INPUT_LIBRARY ${FFMPEG_LIBRARIES})
-    set(SOUND_DEFINE -DOPENMW_USE_FFMPEG)
+    set(SOUND_INPUT_INCLUDES ${SOUND_INPUT_INCLUDES} ${FFMPEG_INCLUDE_DIR})
+    set(SOUND_INPUT_LIBRARY ${SOUND_INPUT_LIBRARY} ${FFMPEG_LIBRARIES})
+    set(SOUND_DEFINE ${SOUND_DEFINE} -DOPENMW_USE_FFMPEG)
 endif (USE_FFMPEG)
 
 if (USE_MPG123)
     find_package(MPG123 REQUIRED)
     find_package(SNDFILE REQUIRED)
-    set(SOUND_INPUT_INCLUDES ${MPG123_INCLUDE_DIR} ${SNDFILE_INCLUDE_DIR})
-    set(SOUND_INPUT_LIBRARY ${MPG123_LIBRARY} ${SNDFILE_LIBRARY})
-    set(SOUND_DEFINE -DOPENMW_USE_MPG123)
+    set(SOUND_INPUT_INCLUDES ${SOUND_INPUT_INCLUDES} ${MPG123_INCLUDE_DIR} ${SNDFILE_INCLUDE_DIR})
+    set(SOUND_INPUT_LIBRARY ${SOUND_INPUT_LIBRARY} ${MPG123_LIBRARY} ${SNDFILE_LIBRARY})
+    set(SOUND_DEFINE ${SOUND_DEFINE} -DOPENMW_USE_MPG123)
 endif (USE_MPG123)
 
 # Platform specific
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.hpp b/apps/openmw/mwsound/ffmpeg_decoder.hpp
index f622b115e..de3925988 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.hpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.hpp
@@ -3,6 +3,11 @@
 
 #include <string>
 
+// FIXME: This can't be right? The headers refuse to build without UINT64_C,
+// which only gets defined in stdint.h in either C99 mode or with this macro
+// defined...
+#define __STDC_CONSTANT_MACROS
+#include <stdint.h>
 extern "C"
 {
 #include <avcodec.h>
@@ -25,6 +30,7 @@ namespace MWSound
         virtual void rewind();
 
         FFmpeg_Decoder();
+    public:
         virtual ~FFmpeg_Decoder();
 
         friend class SoundManager;