diff options
| author | Filippos Karapetis | 2010-05-19 17:18:20 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-05-19 17:18:20 +0000 |
| commit | 9675bf2e7a3d987d636afaf639caa7a62858a447 (patch) | |
| tree | 1e86860cf45ef6caf52c78b22483755bbca6705d /engines | |
| parent | f84b23244322f440e9503eb3519688a6a255be40 (diff) | |
| download | scummvm-rg350-9675bf2e7a3d987d636afaf639caa7a62858a447.tar.gz scummvm-rg350-9675bf2e7a3d987d636afaf639caa7a62858a447.tar.bz2 scummvm-rg350-9675bf2e7a3d987d636afaf639caa7a62858a447.zip | |
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
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/mohawk/video/qt_player.h | 4 |
1 files changed, 0 insertions, 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; |