Mercurial > mm7

diff VideoPlayer.cpp @ 2376:bcd7fadbf7d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 12 May 2014 12:28:06 +0600
parents bbf8a522dcec
children a29d9609f9b2
line wrap: on
line diff
--- a/VideoPlayer.cpp	Mon May 12 12:27:50 2014 +0600
+++ b/VideoPlayer.cpp	Mon May 12 12:28:06 2014 +0600
@@ -232,8 +232,6 @@
   }
   ReadFile(hMightVid, &uNumMightVideoHeaders, 4, &NumberOfBytesRead, 0);
   ReadFile(hMagicVid, &uNumMagicVideoHeaders, 4, &NumberOfBytesRead, 0);
-  pMagicVideoHeaders = 0;
-  pMightVideoHeaders = 0;
   pMightVideoHeaders = (MovieHeader *)malloc(sizeof(MovieHeader) * uNumMightVideoHeaders + 2);
   pMagicVideoHeaders = (MovieHeader *)malloc(sizeof(MovieHeader) * uNumMagicVideoHeaders + 2);
   ReadFile(hMightVid, pMightVideoHeaders, 44 * uNumMightVideoHeaders, &NumberOfBytesRead, 0);
@@ -256,11 +254,8 @@
     AIL_redbook_resume(pAudioPlayer->hAILRedbook);
   pEventTimer->Resume();
 
-  if (pMovie)
-  {
-	  delete pMovie;
-	  pMovie = nullptr;
-  }
+	delete pMovie;
+	pMovie = nullptr;
 }
 
 void VideoPlayer::_inlined_in_463149()