From e465fb6f0888f3f27bf8dc6f37d4c8a936689892 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 11 Apr 2014 09:46:15 +0100
Subject: [PATCH] Fix deadlock.

---
 src/lib/ffmpeg_content.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 86ce7503c..447f3631c 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -268,8 +268,7 @@ FFmpegContent::set_audio_stream (shared_ptr<FFmpegAudioStream> s)
 ContentTime
 FFmpegContent::audio_length () const
 {
-	boost::mutex::scoped_lock lm (_mutex);
-	if (!_audio_stream) {
+	if (!audio_stream ()) {
 		return ContentTime ();
 	}
 
-- 
2.30.2