+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.
def dependencies(target):
return (('ffmpeg-cdist', 'f69bb08'),
- ('libdcp', '5b519d9'),
+ ('libdcp', 'a8d0450'),
('libsub', 'f66b11f'))
def build(target, options):
#include "dcp_subtitle_content.h"
#include "util.h"
#include <libcxml/cxml.h>
+#include <dcp/smpte_subtitle_content.h>
using std::string;
using std::list;
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) {