diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-04-11 09:46:15 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-04-11 09:46:15 +0100 |
| commit | e465fb6f0888f3f27bf8dc6f37d4c8a936689892 (patch) | |
| tree | febaa4b82a6a12778f60ba930f67f8e4108bee32 /src/lib/ffmpeg_content.cc | |
| parent | cb88159075ba02f0a9e013977f109645af797f9b (diff) | |
Fix deadlock.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
| -rw-r--r-- | src/lib/ffmpeg_content.cc | 3 |
1 files changed, 1 insertions, 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 (); } |