X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=65e4cf46afc6ff6ba9ea87a7dcdcc3264acc808a;hb=eb135e8dcdf36ae82420bcd18e954ad593b3e9a5;hp=76755c1fcc2d6e1a3c75b202d5b2d5dc6c266d1e;hpb=f113b2aaca7a65f7b37e12a7d9f3f99e2d834e81;p=dcpomatic.git diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 76755c1fc..65e4cf46a 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -46,11 +46,12 @@ class FFmpegDecoder : public FFmpeg, public Decoder public: FFmpegDecoder (boost::shared_ptr, boost::shared_ptr); + bool pass (); + void seek (ContentTime time, bool); + private: friend struct ::ffmpeg_pts_offset_test; - bool pass (PassReason, bool accurate); - void seek (ContentTime time, bool); void flush (); AVSampleFormat audio_sample_format (boost::shared_ptr stream) const; @@ -66,9 +67,6 @@ private: void maybe_add_subtitle (); boost::shared_ptr deinterleave_audio (boost::shared_ptr stream) const; - std::list image_subtitles_during (ContentTimePeriod, bool starting) const; - std::list text_subtitles_during (ContentTimePeriod, bool starting) const; - boost::shared_ptr _log; std::list > _filter_graphs;