Don't take into account audio decoders with no audio when updating audio_done_up_to, otherwise it will await audio from those decoders that never comes.

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index fd2061a14..99ef9f218 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-01-14  Carl Hetherington  <cth@carlh.net>
 
+	* Fix problems with adding new soundtracks to FFmpeg content with
+	no audio track.
+
 	* Updated de_DE translation from Markus Raab.
 
 	* Version 1.63.1 released.
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 56145f5bd..ce5109733 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -224,7 +224,8 @@ Player::pass ()
 				continue;
 			}
 
-			if (dynamic_pointer_cast<AudioDecoder> ((*i)->decoder)) {
+			shared_ptr<AudioDecoder> ad = dynamic_pointer_cast<AudioDecoder> ((*i)->decoder);
+			if (ad && ad->has_audio ()) {
 				audio_done_up_to = min (audio_done_up_to.get_value_or (TIME_MAX), (*i)->audio_position);
 			}
 		}