Index: OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp
===================================================================
--- OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp (revision 9843)
+++ OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp (revision 9847)
@@ -8,14 +8,12 @@
 #include <OpenThreads/Thread>
 
+#include "FFmpegDecoder.hpp"
+#include "MessageQueue.hpp"
+
 namespace osgFFmpeg
 {
 
-    class FFmpegDecoder;
-    class FFmpegDecoderAudio;
-    class FFmpegDecoderVideo;
-
     template <class T>
     class MessageQueue;
-
 
     class FFmpegImageStream : public osg::ImageStream, public OpenThreads::Thread
@@ -34,13 +32,4 @@
         virtual void rewind();
         virtual void quit(bool waitForThreadToExit = true);
-
-        virtual void setAudioSink(osg::AudioSinkInterface* audio_sink);
-        
-        void consumeAudioBuffer(void * const buffer, const size_t size);
-        
-        bool audioStream() const;
-        int audioFrequency() const;
-        int audioNbChannels() const;
-        osg::AudioStream::SampleFormat audioSampleFormat() const;
 
         double duration() const;
@@ -77,5 +66,5 @@
         static void publishNewFrame(const FFmpegDecoderVideo &, void * user_data);
 
-        FFmpegDecoder *    m_decoder;
+        osg::ref_ptr<FFmpegDecoder>    m_decoder;
         CommandQueue *    m_commands;