aboutsummaryrefslogtreecommitdiff
path: root/graphics/video/qt_decoder.h
diff options
context:
space:
mode:
authorFilippos Karapetis2010-05-26 11:56:58 +0000
committerFilippos Karapetis2010-05-26 11:56:58 +0000
commit14fae8db03e5a314ec19277ef497fbaae03d6177 (patch)
tree1e3a3a88948f435cf50e1aa35d24e9c26557bc56 /graphics/video/qt_decoder.h
parent3187149cca9ab48a391e09c7af6430c2187cd4c6 (diff)
downloadscummvm-rg350-14fae8db03e5a314ec19277ef497fbaae03d6177.tar.gz
scummvm-rg350-14fae8db03e5a314ec19277ef497fbaae03d6177.tar.bz2
scummvm-rg350-14fae8db03e5a314ec19277ef497fbaae03d6177.zip
Proper fix for the MSVC warning concerning packing: reordered the members of the ParseTable struct and removed the struct packing pragmas
svn-id: r49235
Diffstat (limited to 'graphics/video/qt_decoder.h')
-rw-r--r--graphics/video/qt_decoder.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/graphics/video/qt_decoder.h b/graphics/video/qt_decoder.h
index 659ad855e4..db4ff8180b 100644
--- a/graphics/video/qt_decoder.h
+++ b/graphics/video/qt_decoder.h
@@ -136,14 +136,10 @@ protected:
uint32 size;
};
-#include "common/pack-start.h" // START STRUCT PACKING
-
struct ParseTable {
- uint32 type;
int (QuickTimeDecoder::*func)(MOVatom atom);
- } PACKED_STRUCT;
-
-#include "common/pack-end.h" // END STRUCT PACKING
+ uint32 type;
+ };
struct MOVstts {
int count;