2.8 branch: This adds the new ffmpeh plugin, up to a point. Further changes look messy, but will try to merge them. Revisions merged in this commit: 9816-9818, 9826-9827, 9837-9843, 9847, 9850, 9854, 9856-9857, 9860-9861, 9865, 9869, and 9885.

include/osg/ImageStream

@@ -15,6 +15,7 @@
 #define OSG_IMAGESTREAM 1
 
 #include <osg/Image>
+#include <osg/AudioStream>
 
 namespace osg {
 
@@ -86,6 +87,12 @@ class OSG_EXPORT ImageStream : public Image
         
         virtual void setVolume(float) {}
         virtual float getVolume() const { return 0.0f; }
+
+
+        typedef std::vector< osg::ref_ptr<osg::AudioStream> > AudioStreams;
+        void setAudioStreams(const AudioStreams& asl) { _audioStreams = asl; }
+        AudioStreams& getAudioStreams() { return _audioStreams; }
+        const AudioStreams& getAudioStreams() const { return _audioStreams; }
         
 
     protected:
@@ -95,6 +102,8 @@ class OSG_EXPORT ImageStream : public Image
 
         StreamStatus    _status;
         LoopingMode     _loopingMode;
+        
+        AudioStreams    _audioStreams;
 };
 
 } // namespace