From 6c334975aaf31f87dd0283f391671df441022751 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Mon, 31 Aug 2015 14:31:08 +0100
Subject: [PATCH] Bail early from subtitle finding if there are no subtitle
 streams.

---
 ChangeLog                  |  3 +++
 src/lib/ffmpeg_examiner.cc | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index b9087a169..d10b06c24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-08-31  Carl Hetherington  <cth@carlh.net>
 
+	* Stop very long searches for subtitles where
+	there are none.
+
 	* Updated es_ES translation from Manuel AC.
 
 2015-08-30  Carl Hetherington  <cth@carlh.net>
diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 78d97d21e..6ed7b06fe 100644
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -92,6 +92,7 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
 	 * where we should look for subtitles (video and audio are always present,
 	 * so they are ok).
 	 */
+
 	while (true) {
 		int r = av_read_frame (_format_context, &_packet);
 		if (r < 0) {
@@ -108,10 +109,15 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
 			video_packet (context);
 		}
 
+		bool got_all_audio = true;
+
 		for (size_t i = 0; i < _audio_streams.size(); ++i) {
 			if (_audio_streams[i]->uses_index (_format_context, _packet.stream_index)) {
 				audio_packet (context, _audio_streams[i]);
 			}
+			if (!_audio_streams[i]->first_audio) {
+				got_all_audio = false;
+			}
 		}
 
 		for (size_t i = 0; i < _subtitle_streams.size(); ++i) {
@@ -121,6 +127,11 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
 		}
 
 		av_free_packet (&_packet);
+
+		if (_first_video && got_all_audio && _subtitle_streams.empty ()) {
+			/* All done */
+			break;
+		}
 	}
 }
 
-- 
2.30.2