diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-22 10:39:06 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-22 10:39:06 +0000 |
| commit | e8fcbfaa9b5844400a2c64b5cdaa07442cca968d (patch) | |
| tree | 8ea982f308393e1711dc93ffa1f8efc22d8aace4 /src/lib | |
| parent | 7df7b2c7868f67abccb170738e1ae1025cbc0244 (diff) | |
| parent | c1f235f5aeb65cb42c5346419807ac5bb7d6406a (diff) | |
Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/content_factory.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index ed00639a0..f4d9fe4e9 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -29,6 +29,7 @@ #include "dcp_subtitle_content.h" #include "util.h" #include <libcxml/cxml.h> +#include <dcp/smpte_subtitle_content.h> using std::string; using std::list; @@ -86,15 +87,8 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path) content.reset (new SubRipContent (film, path)); } else if (ext == ".xml") { content.reset (new DCPSubtitleContent (film, path)); - } else if (ext == ".mxf") { - /* Try to read this .mxf as a subtitle file; if we fail, we fall back - to using FFmpeg below. - */ - try { - content.reset (new DCPSubtitleContent (film, path)); - } catch (...) { - - } + } else if (ext == ".mxf" && dcp::SMPTESubtitleContent::valid_mxf (path)) { + content.reset (new DCPSubtitleContent (film, path)); } if (!content) { |