Fix deadlock.
authorCarl Hetherington <cth@carlh.net>
Fri, 11 Apr 2014 08:46:15 +0000 (09:46 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 11 Apr 2014 08:46:15 +0000 (09:46 +0100)
src/lib/ffmpeg_content.cc

index 86ce7503c9483c192e78c1655c99391f0ba68d36..447f3631c5ca6924c6175e399902d3fa3fa76d56 100644 (file)
@@ -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 ();
        }