Merge master.

[dcpomatic.git] / src / lib / audio_decoder.h

diff --git a/src/lib/audio_decoder.h b/src/lib/audio_decoder.h
index bb3aafccd6a8982824f890fa05907ea8def66b96..5b68a51a17534d8f07f719927927bf022699f35b 100644 (file)
--- a/src/lib/audio_decoder.h
+++ b/src/lib/audio_decoder.h
@@ -53,7 +53,7 @@ protected:
 
        boost::shared_ptr<const AudioContent> _audio_content;
        boost::shared_ptr<Resampler> _resampler;
-       boost::optional<AudioFrame> _audio_position;
+       boost::optional<ContentTime> _audio_position;
 };
 
 #endif