diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-02-04 09:59:38 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-02-04 09:59:38 +0000 |
| commit | 4ba8772aef261da209bbb882325fd61a8b479fd7 (patch) | |
| tree | 7fe9e3976d52503b474cfa96716c1bd4535b8f8d /src/lib/ffmpeg_content.cc | |
| parent | b299c1873bf23414061d551843275c77a9256a05 (diff) | |
| parent | eec6f90d8e2c2246ce674ae13e4f460b12a4f2a9 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index 394c16aa5..3bee49146 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -62,7 +62,7 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> f, shared_ptr<const cxml::N : Content (f, node) , VideoContent (f, node) , AudioContent (f, node) - , SubtitleContent (f, node) + , SubtitleContent (f, node, version) { list<cxml::NodePtr> c = node->node_children ("SubtitleStream"); for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) { |