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.cc | |
| 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.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index eab85c04e..ae44ff522 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -61,9 +61,9 @@ using std::max; using boost::shared_ptr; using dcp::Size; -FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log> log) +FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log> log, bool fast) : VideoDecoder (c) - , AudioDecoder (c) + , AudioDecoder (c, fast) , SubtitleDecoder (c) , FFmpeg (c) , _log (log) |