Merge master.

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

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 668cab88530d1b385821056aeb837d4b2a011ff0..dd47d306a6e54c0611e0abde6b6ab802cab4e77b 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -43,7 +43,7 @@ extern "C" {
 #include "filter_graph.h"
 #include "audio_buffers.h"
 #include "ffmpeg_content.h"
-#include "image_proxy.h"
+#include "raw_image_proxy.h"
 #include "film.h"
 #include "timer.h"
 
@@ -482,7 +482,7 @@ FFmpegDecoder::decode_subtitle_packet ()
 }
 
 list<ContentTimePeriod>
-FFmpegDecoder::subtitles_during (ContentTimePeriod p) const
+FFmpegDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
 {
-       return _ffmpeg_content->subtitles_during (p);
+       return _ffmpeg_content->subtitles_during (p, starting);
 }