[Scummvm-cvs-logs] SF.net SVN: scummvm:[46209] scummvm/trunk/graphics/video/avi_decoder.cpp

[drmccoy at users.sourceforge.net]

Revision: 46209
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46209&view=rev
Author:   drmccoy
Date:     2009-11-30 01:58:15 +0000 (Mon, 30 Nov 2009)

Log Message:
-----------
Properly clear the chunk headers again on closing

Modified Paths:
--------------
    scummvm/trunk/graphics/video/avi_decoder.cpp

Modified: scummvm/trunk/graphics/video/avi_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/avi_decoder.cpp	2009-11-30 00:13:04 UTC (rev 46208)
+++ scummvm/trunk/graphics/video/avi_decoder.cpp	2009-11-30 01:58:15 UTC (rev 46209)
@@ -273,17 +273,25 @@
 
 	delete[] _videoFrameBuffer;
 	_videoFrameBuffer = 0;
-		
+
 	// Deinitialize sound
 	_mixer->stopHandle(*_audHandle);
-		
+	_audStream = 0;
+
 	_decodedHeader = false;
-	
+
 	delete _videoCodec;
 	_videoCodec = 0;
 
 	delete[] _ixInfo.indices;
 	_ixInfo.indices = 0;
+
+	memset(_palette, 0, sizeof(_palette));
+	memset(&_wvInfo, 0, sizeof(PCMWAVEFORMAT));
+	memset(&_bmInfo, 0, sizeof(BITMAPINFOHEADER));
+	memset(&_vidsHeader, 0, sizeof(AVIStreamHeader));
+	memset(&_audsHeader, 0, sizeof(AVIStreamHeader));
+	memset(&_ixInfo, 0, sizeof(AVIOLDINDEX));
 }
 
 Surface *AviDecoder::getNextFrame() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.