diff options
| author | Strangerke | 2012-10-10 08:26:41 +0200 |
|---|---|---|
| committer | Strangerke | 2012-10-10 08:26:41 +0200 |
| commit | b164cbb571fc4e0f2a6f002760a851d8ac592540 (patch) | |
| tree | 4d25f2e1f8241f6f3352fd9fb1135f5faa36dfd4 /audio/decoders/quicktime_intern.h | |
| parent | b2f2f8d7b08b40e43702e8db325f8136066f10be (diff) | |
| parent | 1e200620d673af4acdd2d128ed6e390df001aacf (diff) | |
| download | scummvm-rg350-b164cbb571fc4e0f2a6f002760a851d8ac592540.tar.gz scummvm-rg350-b164cbb571fc4e0f2a6f002760a851d8ac592540.tar.bz2 scummvm-rg350-b164cbb571fc4e0f2a6f002760a851d8ac592540.zip | |
Merge branch 'master' of github.com:scummvm/scummvm into mortevielle
Conflicts:
base/plugins.cpp
configure
Diffstat (limited to 'audio/decoders/quicktime_intern.h')
| -rw-r--r-- | audio/decoders/quicktime_intern.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/decoders/quicktime_intern.h b/audio/decoders/quicktime_intern.h index efc97cbd13..f1ab037d89 100644 --- a/audio/decoders/quicktime_intern.h +++ b/audio/decoders/quicktime_intern.h @@ -88,7 +88,7 @@ protected: private: QuickTimeAudioDecoder *_decoder; - Track *_parentTrack; + Track *_parentTrack; QueuingAudioStream *_queue; uint _curChunk; Timestamp _curMediaPos, _skipSamples; @@ -115,7 +115,7 @@ protected: ~AudioSampleDesc(); bool isAudioCodecSupported() const; - + AudioStream *createAudioStream(Common::SeekableReadStream *stream) const; void initCodec(); |