Put av_register_all() in the right place.

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 82472c1648a7e1739fe2f6ff32f9e03d79ef17c2..bd7ba98b84fe0f74edd8e50ca195a9873de2ba4b 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -46,7 +46,7 @@ class FFmpegDecoder : public FFmpeg, public Decoder
 public:
        FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
 
-       void pass ();
+       bool pass ();
        void seek (ContentTime time, bool);
 
 private:
@@ -61,8 +61,8 @@ private:
        void decode_audio_packet ();
        void decode_subtitle_packet ();
 
-       void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimePeriod period);
-       void decode_ass_subtitle (std::string ass, ContentTimePeriod period);
+       void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTime from);
+       void decode_ass_subtitle (std::string ass, ContentTime from);
 
        void maybe_add_subtitle ();
        boost::shared_ptr<AudioBuffers> deinterleave_audio (boost::shared_ptr<FFmpegAudioStream> stream) const;
@@ -73,4 +73,6 @@ private:
        boost::mutex _filter_graphs_mutex;
 
        ContentTime _pts_offset;
+       boost::optional<ContentTime> _current_subtitle_to;
+       bool _have_current_subtitle;
 };