Revert "Avoid decoding other packets when looking for subs."

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 41af744471d1f91280c493e8aa2563b4ddaa8494..5475be6122da98b51c4bb8414a837af46d0be087 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -22,21 +22,16 @@
  */
 
 #include "util.h"
-#include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "subtitle_decoder.h"
 #include "ffmpeg.h"
-#include "rect.h"
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
 #include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
 #include <boost/thread/mutex.hpp>
 #include <stdint.h>
-#include <vector>
-#include <string>
 
 class Log;
 class FilterGraph;
@@ -49,7 +44,7 @@ struct ffmpeg_pts_offset_test;
 class FFmpegDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder, public FFmpeg
 {
 public:
-       FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
+       FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>, bool fast);
 
 private:
        friend struct ::ffmpeg_pts_offset_test;
@@ -72,9 +67,9 @@ private:
 
        std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
        std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
-       
+
        boost::shared_ptr<Log> _log;
-       
+
        std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
        boost::mutex _filter_graphs_mutex;