summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-06-12 10:45:38 +0100
committerCarl Hetherington <cth@carlh.net>2014-06-12 10:45:38 +0100
commit4be68e872210db9536ce1997d7fcba1e285765b8 (patch)
treef6393a1a00d4323b2300c0ac92ee24b312fb25c0
parent5a080240dc2828b75fef1b4579ee74d0966f9b4d (diff)
Incorporate Film::_with_subtitles in the Film::video_identifier
Reported-by: Matthias Damm
-rw-r--r--ChangeLog5
-rw-r--r--src/lib/film.cc4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 26bd287dc..55f1dea8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-12 Carl Hetherington <cth@carlh.net>
+
+ * Fix bug where DCP-o-matic does not recreate video after
+ subtitles are turned on or off.
+
2014-06-10 Carl Hetherington <cth@carlh.net>
* Support ISDCF naming convention version 9 (#257).
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 5b709ab1c..609003bba 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -184,6 +184,10 @@ Film::video_identifier () const
s << "_3D";
}
+ if (_with_subtitles) {
+ s << "_WS";
+ }
+
return s.str ();
}