Index: /OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp
===================================================================
--- /OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp (revision 9816)
+++ /OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/ReaderWriterFFmpeg.cpp (revision 9846)
@@ -20,4 +20,5 @@
         supportsExtension("flv", "");
         supportsExtension("mov", "");
+        supportsExtension("ogg", "Theora movie format");
         supportsExtension("mpg", "Mpeg movie format");
         supportsExtension("mpv", "Mpeg movie format");
Index: /OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
===================================================================
--- /OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp (revision 9826)
+++ /OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp (revision 9846)
@@ -4,4 +4,5 @@
 
 
+#include "FFmpegHeaders.hpp"
 #include "BoundedMessageQueue.hpp"
 #include "FFmpegClocks.hpp"
Index: /OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp
===================================================================
--- /OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp (revision 9827)
+++ /OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp (revision 9846)
@@ -7,19 +7,4 @@
 #include <OpenThreads/Condition>
 #include <OpenThreads/Thread>
-
-
-#ifdef _WIN32
-    #if defined OSG_LIBRARY_STATIC
-    #define OSGFFMPEG_EXPORT_API
-    #elif defined OSG_LIBRARY || defined osgFFmpeg_EXPORTS
-    #define OSGFFMPEG_EXPORT_API  __declspec(dllexport)
-    #else
-    #define OSGFFMPEG_EXPORT_API  __declspec(dllimport);
-    #endif
-#else
-    #define OSGFFMPEG_EXPORT_API
-#endif
-
-
 
 namespace osgFFmpeg
@@ -34,5 +19,5 @@
 
 
-    class OSGFFMPEG_EXPORT_API FFmpegImageStream : public osg::ImageStream, public OpenThreads::Thread
+    class FFmpegImageStream : public osg::ImageStream, public OpenThreads::Thread
     {
     public:
Index: /OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/CMakeLists.txt
===================================================================
--- /OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/CMakeLists.txt (revision 9827)
+++ /OpenSceneGraph/branches/osg-cocoa-dev/src/osgPlugins/ffmpeg/CMakeLists.txt (revision 9846)
@@ -2,12 +2,15 @@
 
 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
+    ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/libavformat ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/ffmpeg
+    ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}/libavdevice ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}/ffmpeg
+    ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/libavcodec ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/ffmpeg
+    ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/libavcodec ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/ffmpeg
 )
 
-MESSAGE("FFMPEG_INCLUDE_DIRS = "  ${FFMPEG_INCLUDE_DIRS} )
-MESSAGE("FFMPEG_LIBRARIES = "  ${FFMPEG_LIBRARIES} )
+# MESSAGE("FFMPEG_LIBAVFORMAT_INCLUDE_DIRS = "  ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} )
+# MESSAGE("FFMPEG_LIBAVDEVICE_INCLUDE_DIRS = "  ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} )
+# MESSAGE("FFMPEG_LIBAVCODEC_INCLUDE_DIRS = "  ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} )
+# MESSAGE("FFMPEG_LIBAVUTIL_INCLUDE_DIRS = "  ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} )
+# MESSAGE("FFMPEG_LIBRARIES = "  ${FFMPEG_LIBRARIES} )
 
 SET(TARGET_SRC 
@@ -31,7 +34,9 @@
 )
 
+LINK_DIRECTORIES(${FFMPEG_LIBRARY_DIRS})
+
 SET(TARGET_EXTERNAL_LIBRARIES ${FFMPEG_LIBRARIES} )
 
 
 #### end var setup  ###
-SETUP_PLUGIN(ffmpeg)
+SETUP_PLUGIN(ffmpeg ffmpeg)
Index: /OpenSceneGraph/branches/osg-cocoa-dev/CMakeModules/FindFFmpeg.cmake
===================================================================
--- /OpenSceneGraph/branches/osg-cocoa-dev/CMakeModules/FindFFmpeg.cmake (revision 9817)
+++ /OpenSceneGraph/branches/osg-cocoa-dev/CMakeModules/FindFFmpeg.cmake (revision 9846)
@@ -1,6 +1,6 @@
-# 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
 #
@@ -10,5 +10,5 @@
 # Created by Robert Osfield. 
 
-#use pkg-config to find various modues
+#use pkg-config to find various modes
 INCLUDE(FindPkgConfig OPTIONAL)
 
@@ -30,5 +30,7 @@
 
     SET(FFMPEG_INCLUDE_DIRS ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS})
-    
+
+    SET(FFMPEG_LIBRARY_DIRS ${FFMPEG_LIBAVFORMAT_LIBRARY_DIRS})
+
     SET(FFMPEG_LIBRARIES
         ${FFMPEG_LIBAVFORMAT_LIBRARIES}
@@ -36,5 +38,5 @@
         ${FFMPEG_LIBAVCODEC_LIBRARIES}
         ${FFMPEG_LIBAVUTIL_LIBRARIES})
-    
+   
 ENDIF(FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND FFMPEG_LIBAVUTIL_FOUND)