diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-05-10 13:22:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | cc76b517f6a74f813ae38137bdc88ff3bafa6dd9 (patch) | |
| tree | 34c2960763f897936efef689898a1f392fb38375 /src/lib/ffmpeg_content.cc | |
| parent | a3073b3059e8df6304d2936ab2c605e6908a7373 (diff) | |
Allow content parts to not be preset in XML.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index f249a1c35..a8206b13e 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -74,9 +74,9 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, boost::filesystem::pa FFmpegContent::FFmpegContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version, list<string>& notes) : Content (film, node) { - video.reset (new VideoContent (this, film, node, version)); - audio.reset (new AudioContent (this, film, node)); - subtitle.reset (new SubtitleContent (this, film, node, version)); + video = VideoContent::from_xml (this, film, node, version); + audio = AudioContent::from_xml (this, film, node); + subtitle = SubtitleContent::from_xml (this, film, node, version); list<cxml::NodePtr> c = node->node_children ("SubtitleStream"); for (list<cxml::NodePtr>::const_iterator i = c.begin(); i != c.end(); ++i) { |