diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-09-09 22:00:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-09-09 22:00:09 +0100 |
| commit | 43494601da412259814fdb1345950329cc4aa849 (patch) | |
| tree | 4c7d5fb8038998753862bab0b7192109786996de /src/lib/ffmpeg_decoder.h | |
| parent | 70aaee5bb3fd57ae749357b72f7afb655fd643e6 (diff) | |
| parent | cb3d1d6eda4c798263e86c60c571fbfbeb025acd (diff) | |
Merge branch '2.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0
Diffstat (limited to 'src/lib/ffmpeg_decoder.h')
| -rw-r--r-- | src/lib/ffmpeg_decoder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 28d8e4baa..5475be612 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -44,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; |