diff options
| author | Kamil Zbrog | 2014-03-29 22:13:07 +0100 |
|---|---|---|
| committer | Kamil Zbrog | 2014-03-29 22:13:07 +0100 |
| commit | 5ffa58dba7a941249af9ca8c1bd229c310fb296b (patch) | |
| tree | 49faae8eb3424c32d890b4d3cd1eefeb11fc3cd9 /common/quicktime.h | |
| parent | 8eac80cfc59c34299899ebe18a3b0582ef76e0d2 (diff) | |
| parent | 620411bfebe72fb0f60c4d8f64558be088cff58d (diff) | |
| download | scummvm-rg350-5ffa58dba7a941249af9ca8c1bd229c310fb296b.tar.gz scummvm-rg350-5ffa58dba7a941249af9ca8c1bd229c310fb296b.tar.bz2 scummvm-rg350-5ffa58dba7a941249af9ca8c1bd229c310fb296b.zip | |
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'common/quicktime.h')
| -rw-r--r-- | common/quicktime.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/common/quicktime.h b/common/quicktime.h index caa92578b1..f5fd578e3a 100644 --- a/common/quicktime.h +++ b/common/quicktime.h @@ -108,10 +108,13 @@ protected: class SampleDesc { public: SampleDesc(Track *parentTrack, uint32 codecTag); - virtual ~SampleDesc() {} + virtual ~SampleDesc(); uint32 getCodecTag() const { return _codecTag; } + SeekableReadStream *_extraData; + byte _objectTypeMP4; + protected: Track *_parentTrack; uint32 _codecTag; @@ -150,16 +153,12 @@ protected: uint32 editCount; EditListEntry *editList; - SeekableReadStream *extraData; - uint32 frameCount; uint32 duration; uint32 mediaDuration; uint32 startTime; Rational scaleFactorX; Rational scaleFactorY; - - byte objectTypeMP4; }; virtual SampleDesc *readSampleDesc(Track *track, uint32 format, uint32 descSize) = 0; |