summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-05-31 20:12:03 +0100
committerCarl Hetherington <cth@carlh.net>2016-05-31 20:12:03 +0100
commit27f2a05802af7acf7ee8db3892fd38007ac4f1d3 (patch)
tree1545453453a526286684b7f71b4846476fc38ca3
parent6494f92fcf836c4732220217f6a95379926a277a (diff)
Remove mention of finding subtitles when examining audio-only content (#882).
-rw-r--r--ChangeLog5
-rw-r--r--src/lib/ffmpeg_examiner.cc4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cb9f7483b..527676c4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-05-31 Carl Hetherington <cth@carlh.net>
+
+ * Remove mention of finding subtitles when examining
+ audio-only content (#882).
+
2016-05-30 Carl Hetherington <cth@carlh.net>
* Version 2.8.5 released.
diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index f03b744a1..f98c478e7 100644
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -92,8 +92,10 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
if (job) {
if (_need_video_length) {
job->sub (_("Finding length and subtitles"));
- } else {
+ } else if (!_subtitle_streams.empty()) {
job->sub (_("Finding subtitles"));
+ } else {
+ job->sub (_("Finding length"));
}
}