[Scummvm-cvs-logs] scummvm master -> 7de11f136277862a6e6b45f0c744f49c986733d8

[m-kiewitz]

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

Summary:
7de11f1362 SHERLOCK: 3DO movie player unsupported codec msg


Commit: 7de11f136277862a6e6b45f0c744f49c986733d8
    https://github.com/scummvm/scummvm/commit/7de11f136277862a6e6b45f0c744f49c986733d8
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2015-06-04T16:57:33+02:00

Commit Message:
SHERLOCK: 3DO movie player unsupported codec msg

Changed paths:
    engines/sherlock/scalpel/3do/movie_decoder.cpp



diff --git a/engines/sherlock/scalpel/3do/movie_decoder.cpp b/engines/sherlock/scalpel/3do/movie_decoder.cpp
index 8aefa42..6e663f7 100644
--- a/engines/sherlock/scalpel/3do/movie_decoder.cpp
+++ b/engines/sherlock/scalpel/3do/movie_decoder.cpp
@@ -370,7 +370,7 @@ Scalpel3DOMovieDecoder::StreamVideoTrack::StreamVideoTrack(uint32 width, uint32
 	if (codecTag == MKTAG('c', 'v', 'i', 'd'))
 		_codec = new Image::CinepakDecoder();
 	else
-		error("Unknown Sherlock 3DO stream codec tag '%s'", tag2str(codecTag));
+		error("Unsupported Sherlock 3DO movie video codec tag '%s'", tag2str(codecTag));
 }
 
 Scalpel3DOMovieDecoder::StreamVideoTrack::~StreamVideoTrack() {
@@ -398,7 +398,7 @@ Scalpel3DOMovieDecoder::StreamAudioTrack::StreamAudioTrack(uint32 codecTag, uint
 		break;
 
 	default:
-		error("Sherlock 3DO stream audio is not using codec ADP4");
+		error("Unsupported Sherlock 3DO movie audio codec tag '%s'", tag2str(codecTag));
 	}
 
 	_totalAudioQueued = 0; // currently 0 milliseconds queued