diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-29 15:07:17 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-29 15:07:17 +0100 |
| commit | 318a778b1b5c98b79b202dc953ff2ac131371a1b (patch) | |
| tree | 52d05d9927c22842c5047a625e07eb9c92f87cdb /src/lib/subtitle_decoder.h | |
| parent | 3802ba3df2ac27d4fabdcbd61b9ed84f6adf5627 (diff) | |
| parent | b289602176a4943233cffb75e8ccac379112420a (diff) | |
Fix merge.
Diffstat (limited to 'src/lib/subtitle_decoder.h')
| -rw-r--r-- | src/lib/subtitle_decoder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h index c958419c7..5f11e27e7 100644 --- a/src/lib/subtitle_decoder.h +++ b/src/lib/subtitle_decoder.h @@ -42,7 +42,7 @@ protected: void seek (ContentTime, bool); void image_subtitle (ContentTimePeriod period, boost::shared_ptr<Image>, dcpomatic::Rect<double>); - void text_subtitle (std::list<dcp::SubtitleString>); + void text_subtitle (ContentTimePeriod period, std::list<dcp::SubtitleString>); std::list<ContentImageSubtitle> _decoded_image_subtitles; std::list<ContentTextSubtitle> _decoded_text_subtitles; |