From 9675bf2e7a3d987d636afaf639caa7a62858a447 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Wed, 19 May 2010 17:18:20 +0000 Subject: Reverted commit #49088, seems like to be a false positive from MSVC on the QTPlayer::*func pointer of the ParseTable struct (warning 4121, alignment of a member was sensitive to packing) svn-id: r49106 --- engines/mohawk/video/qt_player.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/engines/mohawk/video/qt_player.h b/engines/mohawk/video/qt_player.h index 724db3538e..205b18f99c 100644 --- a/engines/mohawk/video/qt_player.h +++ b/engines/mohawk/video/qt_player.h @@ -124,8 +124,6 @@ protected: // This is the file handle from which data is read from. It can be the actual file handle or a decompressed stream. Common::SeekableReadStream *_fd; -#include "common/pack-start.h" // START STRUCT PACKING - struct MOVatom { uint32 type; uint32 offset; @@ -216,8 +214,6 @@ protected: ScaleMode scaleMode; }; -#include "common/pack-end.h" // END STRUCT PACKING - const ParseTable *_parseTable; bool _foundMOOV; bool _foundMDAT; -- cgit v1.2.3