diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | src/lib/content_factory.cc | 12 | ||||
| -rw-r--r-- | wscript | 2 |
5 files changed, 17 insertions, 13 deletions
@@ -1,3 +1,12 @@ +2015-01-21 Carl Hetherington <cth@carlh.net> + + * Version 2.0.36 released. + +2015-01-21 Carl Hetherington <cth@carlh.net> + + * Fix differentiation between MXF-wrapped subtitles + and video/audio content. + 2015-01-20 Carl Hetherington <cth@carlh.net> * Version 2.0.35 released. @@ -156,7 +156,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', 'f69bb08'), - ('libdcp', '5b519d9'), + ('libdcp', 'a8d0450'), ('libsub', 'f66b11f')) def build(target, options): diff --git a/debian/changelog b/debian/changelog index 28d0195f7..f9dad6546 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (2.0.35-1) UNRELEASED; urgency=low +dcpomatic (2.0.36-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -214,8 +214,9 @@ dcpomatic (2.0.35-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington <carl@d1stkfactory> Tue, 20 Jan 2015 14:51:23 +0000 + -- Carl Hetherington <carl@d1stkfactory> Wed, 21 Jan 2015 19:37:44 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low 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) { @@ -5,7 +5,7 @@ import distutils import distutils.spawn APPNAME = 'dcpomatic' -VERSION = '2.0.35devel' +VERSION = '2.0.36devel' def options(opt): opt.load('compiler_cxx') |