aboutsummaryrefslogtreecommitdiff
path: root/video/qt_decoder.h
diff options
context:
space:
mode:
authorMatthew Hoops2011-06-03 00:54:30 -0400
committerMatthew Hoops2011-06-03 00:58:29 -0400
commit547fd1bdcabcba0e741eb31100ba99ff73399d24 (patch)
tree99c9f92560d880b85f596e48e146f83b6f59d4c2 /video/qt_decoder.h
parent2e066816983935b8e365fc555f953bdce9f64e46 (diff)
downloadscummvm-rg350-547fd1bdcabcba0e741eb31100ba99ff73399d24.tar.gz
scummvm-rg350-547fd1bdcabcba0e741eb31100ba99ff73399d24.tar.bz2
scummvm-rg350-547fd1bdcabcba0e741eb31100ba99ff73399d24.zip
COMMON: Cleanup QuickTime variable and struct naming
Diffstat (limited to 'video/qt_decoder.h')
-rw-r--r--video/qt_decoder.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/video/qt_decoder.h b/video/qt_decoder.h
index e3955d7d3b..b51fd043e7 100644
--- a/video/qt_decoder.h
+++ b/video/qt_decoder.h
@@ -116,7 +116,7 @@ public:
protected:
class VideoSampleDesc : public Common::QuickTimeParser::SampleDesc {
public:
- VideoSampleDesc(Common::QuickTimeParser::MOVStreamContext *parentStream, uint32 codecTag);
+ VideoSampleDesc(Common::QuickTimeParser::Track *parentTrack, uint32 codecTag);
~VideoSampleDesc();
void initCodec();
@@ -129,7 +129,7 @@ protected:
Codec *_videoCodec;
};
- Common::QuickTimeParser::SampleDesc *readSampleDesc(MOVStreamContext *st, uint32 format);
+ Common::QuickTimeParser::SampleDesc *readSampleDesc(Track *track, uint32 format);
private:
Common::SeekableReadStream *getNextFramePacket(uint32 &descId);
@@ -146,7 +146,7 @@ private:
Codec *createCodec(uint32 codecTag, byte bitsPerPixel);
Codec *findDefaultVideoCodec() const;
uint32 _nextFrameStartTime;
- int8 _videoStreamIndex;
+ int _videoTrackIndex;
uint32 findKeyFrame(uint32 frame) const;
bool _dirtyPalette;