Merge branch 'master' into 1.0-seek

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 55b624bd60e1df843fbfb7eb0aacd7ef9c9746a6..680e39c393a9dad5aca9e71cae4337e9108e1472 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -58,6 +58,7 @@ private:
 
        bool pass ();
        void flush ();
+       ContentTime first_audio () const;
 
        void setup_subtitle ();
 
@@ -85,6 +86,5 @@ private:
        bool _decode_video;
        bool _decode_audio;
 
-       double _video_pts_offset;
-       double _audio_pts_offset;
+       double _pts_offset;
 };