From 19ee0f011e22d8aa6b8967cf2b9500850cddc30e Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 25 Feb 2009 20:52:34 +0000
Subject: [PATCH] Tweaks to handle more modern version of ffmpeg compiled form
 source.

---
 src/osgPlugins/ffmpeg/CMakeLists.txt         | 12 +++++++++++-
 src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp |  2 --
 src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp |  5 +++--
 src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp |  1 -
 src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp |  7 +++----
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/osgPlugins/ffmpeg/CMakeLists.txt b/src/osgPlugins/ffmpeg/CMakeLists.txt
index d4efee49f..82265ec34 100644
--- a/src/osgPlugins/ffmpeg/CMakeLists.txt
+++ b/src/osgPlugins/ffmpeg/CMakeLists.txt
@@ -1,4 +1,14 @@
-INCLUDE_DIRECTORIES( ${FFMPEG_INCLUDE_DIRS} )
+# INCLUDE_DIRECTORIES( ${FFMPEG_INCLUDE_DIRS} )
+
+INCLUDE_DIRECTORIES( 
+    ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/libavformat
+    ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}/libavdevice
+    ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/libavcodec
+    ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/libavcodec
+)
+
+MESSAGE("FFMPEG_INCLUDE_DIRS = "  ${FFMPEG_INCLUDE_DIRS} )
+MESSAGE("FFMPEG_LIBRARIES = "  ${FFMPEG_LIBRARIES} )
 
 SET(TARGET_SRC 
     FFmpegClocks.cpp
diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp
index 52d46196c..03e0a048c 100644
--- a/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp
+++ b/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp
@@ -1,9 +1,7 @@
-
 #include "FFmpegDecoderAudio.hpp"
 
 #include <osg/Notify>
 
-
 #include <stdexcept>
 #include <string.h>
 
diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp b/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp
index db8b6d7fd..afc84bafe 100644
--- a/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp
+++ b/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp
@@ -4,12 +4,13 @@
 
 #include <OpenThreads/Thread>
 
-#include "AudioSinkInterface.hpp"
-#include "BoundedMessageQueue.hpp"
 #include "FFmpegClocks.hpp"
 #include "FFmpegPacket.hpp"
 #include "FFmpegSampleFormat.hpp"
 
+#include "AudioSinkInterface.hpp"
+#include "BoundedMessageQueue.hpp"
+
 
 
 namespace osgFFmpeg {
diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
index 62e88e05a..114bb13e4 100644
--- a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
+++ b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
@@ -1,4 +1,3 @@
-
 #include "FFmpegDecoderVideo.hpp"
 
 #include <osg/Notify>
diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
index 8379a4778..0fa6d60d3 100644
--- a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
+++ b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
@@ -2,15 +2,14 @@
 #ifndef HEADER_GUARD_OSGFFMPEG_FFMPEG_DECODER_VIDEO_H
 #define HEADER_GUARD_OSGFFMPEG_FFMPEG_DECODER_VIDEO_H
 
-#include <boost/shared_ptr.hpp>
-#include <OpenThreads/Thread>
-#include <vector>
 
 #include "BoundedMessageQueue.hpp"
 #include "FFmpegClocks.hpp"
 #include "FFmpegPacket.hpp"
 
-
+#include <boost/shared_ptr.hpp>
+#include <OpenThreads/Thread>
+#include <vector>
 
 namespace osgFFmpeg {