Index: /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp (revision 9816)
+++ /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp (revision 9818)
@@ -1,7 +1,5 @@
-
 #include "FFmpegDecoderAudio.hpp"
 
 #include <osg/Notify>
-
 
 #include <stdexcept>
Index: /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp
===================================================================
--- /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp (revision 9816)
+++ /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp (revision 9818)
@@ -5,9 +5,10 @@
 #include <OpenThreads/Thread>
 
-#include "AudioSinkInterface.hpp"
-#include "BoundedMessageQueue.hpp"
 #include "FFmpegClocks.hpp"
 #include "FFmpegPacket.hpp"
 #include "FFmpegSampleFormat.hpp"
+
+#include "AudioSinkInterface.hpp"
+#include "BoundedMessageQueue.hpp"
 
 
Index: /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp (revision 9816)
+++ /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp (revision 9818)
@@ -1,3 +1,2 @@
-
 #include "FFmpegDecoderVideo.hpp"
 
Index: /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
===================================================================
--- /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp (revision 9816)
+++ /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp (revision 9818)
@@ -3,7 +3,4 @@
 #define HEADER_GUARD_OSGFFMPEG_FFMPEG_DECODER_VIDEO_H
 
-#include <boost/shared_ptr.hpp>
-#include <OpenThreads/Thread>
-#include <vector>
 
 #include "BoundedMessageQueue.hpp"
@@ -11,5 +8,7 @@
 #include "FFmpegPacket.hpp"
 
-
+#include <boost/shared_ptr.hpp>
+#include <OpenThreads/Thread>
+#include <vector>
 
 namespace osgFFmpeg {
Index: /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/CMakeLists.txt
===================================================================
--- /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/CMakeLists.txt (revision 9816)
+++ /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/CMakeLists.txt (revision 9818)
@@ -1,3 +1,13 @@
-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