Remove mention of finding subtitles when examining audio-only content (#882).

diff --git a/ChangeLog b/ChangeLog
index cb9f7483b72c9f703b3158a9f8e2d774cec0b8b7..527676c4eee9bd55d783bc86657f73d591ddb21e 100644 (file)
--- 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 f03b744a160a3a13170d32f164b1d19aa6046d7f..f98c478e7f46f2039b3cd7113444b9c81ea93b42 100644 (file)
--- 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"));
                }
        }