[Scummvm-git-logs] scummvm master -> cf179868c8088be7b416f17bd68fe56ad426df5f

bluegr bluegr at gmail.com
Fri Sep 13 10:27:28 CEST 2019


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:
cf179868c8 VIDEO: Fix embedded subtitles in VMD videos


Commit: cf179868c8088be7b416f17bd68fe56ad426df5f
    https://github.com/scummvm/scummvm/commit/cf179868c8088be7b416f17bd68fe56ad426df5f
Author: Dmitry Blau (dimouseandzubik at gmail.com)
Date: 2019-09-13T11:27:24+03:00

Commit Message:
VIDEO: Fix embedded subtitles in VMD videos

This fixes the subtitles in Woodruff - bug 10960

Changed paths:
    video/coktel_decoder.cpp


diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp
index 981dd82..d4a08ef 100644
--- a/video/coktel_decoder.cpp
+++ b/video/coktel_decoder.cpp
@@ -2071,9 +2071,9 @@ bool VMDDecoder::readFrameTable(int &numFiles) {
 				_frames[i].parts[j].flags   = _stream->readByte();
 
 			} else if (_frames[i].parts[j].type == kPartTypeSubtitle) {
-				_frames[i].parts[j].id = _stream->readUint16LE();
+				_frames[i].parts[j].id = _stream->readByte();
 				// Speech text file name
-				_stream->skip(8);
+				_stream->skip(9);
 			} else if (_frames[i].parts[j].type == kPartTypeFile) {
 				if (!separator)
 					numFiles++;





More information about the Scummvm-git-logs mailing list