Changeset 9869 for OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp

Timestamp:

03/08/09 17:48:48 (4 years ago)

Author:

robert

Message:

Fixed thread exit problems

Files:

• OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp

@@ -32 +32 @@
 FFmpegDecoder::~FFmpegDecoder()
 {
-    close();
+    close(true);
 }
 
@@ -124 +124 @@
 
 
-void FFmpegDecoder::close()
+void FFmpegDecoder::close(bool waitForThreadToExit)
 {
     flushAudioQueue();
     flushVideoQueue();
+    
+    m_audio_decoder.close(waitForThreadToExit);
+    m_video_decoder.close(waitForThreadToExit);
 }