projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a9cb50c
)
Parse .ass files using the text subtitle code.
author
Carl Hetherington
<cth@carlh.net>
Sat, 18 Jun 2016 22:53:02 +0000
(23:53 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 18 Jun 2016 22:53:02 +0000
(23:53 +0100)
src/lib/content_factory.cc
patch
|
blob
|
history
diff --git
a/src/lib/content_factory.cc
b/src/lib/content_factory.cc
index 38112b968564e96ae6399af3575cd381986a5139..d3905e4e7c443a2d0c59bb06947f57b669c09f46 100644
(file)
--- a/
src/lib/content_factory.cc
+++ b/
src/lib/content_factory.cc
@@
-164,7
+164,7
@@
content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
if (valid_image_file (path)) {
content.reset (new ImageContent (film, path));
- } else if (ext == ".srt" || ext == ".ssa") {
+ } else if (ext == ".srt" || ext == ".ssa"
|| ext == ".ass"
) {
content.reset (new TextSubtitleContent (film, path));
} else if (ext == ".xml") {
content.reset (new DCPSubtitleContent (film, path));