summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-08-31 00:19:00 +0100
committerCarl Hetherington <cth@carlh.net>2017-08-31 00:19:00 +0100
commit01b35c34a36f35a29899db2fd6c4759de89a8860 (patch)
tree75efd71c234e7e22ec3f783f614205f1e15f751b
parent90f3ff7d32df052635c84bfcec10a39fb1fca50b (diff)
Fix erroneous re-use of video files after turning off burnt subtitles (#1113).
-rw-r--r--ChangeLog4
-rw-r--r--src/lib/ffmpeg_content.cc2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 07279d8f5..e78fdab85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-08-31 Carl Hetherington <cth@carlh.net>
+
+ * Fix erroneous re-use of video files after turning off burnt subtitles (#1113).
+
2017-08-30 Carl Hetherington <cth@carlh.net>
* Updated es_ES translation from Manuel AC.
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 3cd9d66e2..92069cb60 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -397,7 +397,7 @@ FFmpegContent::identifier () const
s += "_" + video->identifier();
}
- if (subtitle) {
+ if (subtitle && subtitle->use() && subtitle->burn()) {
s += "_" + subtitle->identifier();
}