diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-09 00:50:41 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-09 00:50:41 +0100 |
| commit | a04e7f3054f0d99c8f54863142d096bc655a4bc9 (patch) | |
| tree | 957bdbf8612de2c91fc72858ccec7f762b28f2bc /src/lib/ffmpeg_content.cc | |
| parent | ee499dec32aa8e11a59bfdc707695a179d2bb252 (diff) | |
Speculative Arch fix.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc index cb887b3bb..f8a1a142a 100644 --- a/src/lib/ffmpeg_content.cc +++ b/src/lib/ffmpeg_content.cc @@ -50,6 +50,7 @@ using std::pair; using std::make_pair; using boost::shared_ptr; using boost::dynamic_pointer_cast; +using boost::optional; int const FFmpegContentProperty::SUBTITLE_STREAMS = 100; int const FFmpegContentProperty::SUBTITLE_STREAM = 101; @@ -97,7 +98,10 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, cxml::ConstNodePtr no } } - _first_video = node->optional_number_child<double> ("FirstVideo"); + optional<ContentTime::Type> const f = node->optional_number_child<ContentTime::Type> ("FirstVideo"); + if (f) { + _first_video = ContentTime (f.get ()); + } _color_range = static_cast<AVColorRange> (node->optional_number_child<int>("ColorRange").get_value_or (AVCOL_RANGE_UNSPECIFIED)); _color_primaries = static_cast<AVColorPrimaries> (node->optional_number_child<int>("ColorPrimaries").get_value_or (AVCOL_PRI_UNSPECIFIED)); |