summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-12 13:38:05 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-12 13:38:05 +0100
commitad27e9acc3d99a29fdc358da62feb603983f8882 (patch)
tree8a403d86220aaa0138fbdc7407771d23c1cdc5fb /src/lib
parent0d65e6ab06f798ca905c0ae5c1d0203ac254377c (diff)
Fix FFmpeg subtitle stream serialisation.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ffmpeg_subtitle_stream.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_subtitle_stream.cc b/src/lib/ffmpeg_subtitle_stream.cc
index 77a56e330..b322428b9 100644
--- a/src/lib/ffmpeg_subtitle_stream.cc
+++ b/src/lib/ffmpeg_subtitle_stream.cc
@@ -36,8 +36,8 @@ FFmpegSubtitleStream::FFmpegSubtitleStream (cxml::ConstNodePtr node)
BOOST_FOREACH (cxml::NodePtr i, node->node_children ("Period")) {
add_subtitle (
ContentTimePeriod (
- ContentTime (node->number_child<ContentTime::Type> ("From")),
- ContentTime (node->number_child<ContentTime::Type> ("To"))
+ ContentTime (i->number_child<ContentTime::Type> ("From")),
+ ContentTime (i->number_child<ContentTime::Type> ("To"))
)
);
}
@@ -49,7 +49,7 @@ FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const
FFmpegStream::as_xml (root);
for (map<ContentTime, ContentTime>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
- xmlpp::Node* node = root->add_child ("Subtitle");
+ xmlpp::Node* node = root->add_child ("Period");
node->add_child("From")->add_child_text (raw_convert<string> (i->first.get ()));
node->add_child("To")->add_child_text (raw_convert<string> (i->second.get ()));
}