X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=5475be6122da98b51c4bb8414a837af46d0be087;hb=526fd6de4c80a7ac9614a1cb0209efff7b171cd5;hp=41af744471d1f91280c493e8aa2563b4ddaa8494;hpb=bdbfd6b08856a445446bfd845f1c43109d184250;p=dcpomatic.git diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 41af74447..5475be612 100644 --- 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 } #include -#include #include #include -#include -#include 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, boost::shared_ptr); + FFmpegDecoder (boost::shared_ptr, boost::shared_ptr, bool fast); private: friend struct ::ffmpeg_pts_offset_test; @@ -72,9 +67,9 @@ private: 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; boost::mutex _filter_graphs_mutex;