Tweaks to handle more modern version of ffmpeg compiled form source.

openscenegraph · Feb 25, 2009 · 2f99b84 · 2f99b84
1 parent 1621ef8
commit 2f99b84
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,4 +1,3 @@
-
 #include "FFmpegDecoderVideo.hpp"
 
 #include <osg/Notify>

diff --git 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 {