From 8a8cee05c5d340008b4a8da1f7c90569b09848de Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 3 Mar 2009 10:53:26 +0000
Subject: [PATCH] From Ulrich Hertlein, build fixes for OSX.

---
 CMakeModules/FindFFmpeg.cmake                | 12 +++++++-----
 src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CMakeModules/FindFFmpeg.cmake b/CMakeModules/FindFFmpeg.cmake
index e42561497..3cc91d8b5 100644
--- a/CMakeModules/FindFFmpeg.cmake
+++ b/CMakeModules/FindFFmpeg.cmake
@@ -1,7 +1,7 @@
-# Locate gdal
+# Locate ffmpeg
 # This module defines
 # FFMPEG_LIBRARIES
-# FFMPEG_FOUND, if false, do not try to link to gdal 
+# FFMPEG_FOUND, if false, do not try to link to ffmpeg 
 # FFMPEG_INCLUDE_DIR, where to find the headers
 #
 # $FFMPEG_DIR is an environment variable that would
@@ -9,7 +9,7 @@
 #
 # Created by Robert Osfield. 
 
-#use pkg-config to find various modues
+#use pkg-config to find various modes
 INCLUDE(FindPkgConfig OPTIONAL)
 
 IF(PKG_CONFIG_FOUND)
@@ -29,13 +29,15 @@ IF   (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODE
     SET(FFMPEG_FOUND "YES")
 
     SET(FFMPEG_INCLUDE_DIRS ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS})
-    
+
+    SET(FFMPEG_LIBRARY_DIRS ${FFMPEG_LIBAVFORMAT_LIBRARY_DIRS})
+
     SET(FFMPEG_LIBRARIES
         ${FFMPEG_LIBAVFORMAT_LIBRARIES}
         ${FFMPEG_LIBAVDEVICE_LIBRARIES}
         ${FFMPEG_LIBAVCODEC_LIBRARIES}
         ${FFMPEG_LIBAVUTIL_LIBRARIES})
-    
+   
 ENDIF(FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND FFMPEG_LIBAVUTIL_FOUND)
 
 
diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
index 2d1a0ef3e..33fcafad7 100644
--- a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
+++ b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
@@ -3,6 +3,7 @@
 #define HEADER_GUARD_OSGFFMPEG_FFMPEG_DECODER_VIDEO_H
 
 
+#include "FFmpegHeaders.hpp"
 #include "BoundedMessageQueue.hpp"
 #include "FFmpegClocks.hpp"
 #include "FFmpegPacket.hpp"