[Scummvm-cvs-logs] scummvm master -> 8f1c16071698c472a973e46c362fb71fc3c47d6c

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
25c852f1a5 SWORD25: Fix frozen/flickering title menu movie
8f1c160716 Merge pull request #705 from ottogin/sword25-video-fix


Commit: 25c852f1a5ea8c50cca5d6b6c4debba56ad0988d
    https://github.com/scummvm/scummvm/commit/25c852f1a5ea8c50cca5d6b6c4debba56ad0988d
Author: ottogin (lukartoil at mail.ru)
Date: 2016-03-14T03:29:03+03:00

Commit Message:
SWORD25: Fix frozen/flickering title menu movie
Fixes bug #6978: Unload old movie before loading a new one

Changed paths:
    engines/sword25/fmv/movieplayer.cpp



diff --git a/engines/sword25/fmv/movieplayer.cpp b/engines/sword25/fmv/movieplayer.cpp
index eb0f039..62a897a3 100644
--- a/engines/sword25/fmv/movieplayer.cpp
+++ b/engines/sword25/fmv/movieplayer.cpp
@@ -58,6 +58,8 @@ MoviePlayer::~MoviePlayer() {
 }
 
 bool MoviePlayer::loadMovie(const Common::String &filename, uint z) {
+	if (isMovieLoaded())
+		unloadMovie();
 	// Get the file and load it into the decoder
 	Common::SeekableReadStream *in = Kernel::getInstance()->getPackage()->getStream(filename);
 	_decoder.loadStream(in);


Commit: 8f1c16071698c472a973e46c362fb71fc3c47d6c
    https://github.com/scummvm/scummvm/commit/8f1c16071698c472a973e46c362fb71fc3c47d6c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-14T22:05:10+01:00

Commit Message:
Merge pull request #705 from ottogin/sword25-video-fix

SWORD25: Fix video loop in intro

Changed paths:
    engines/sword25/fmv/movieplayer.cpp