summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-03-06 23:37:59 +0000
committerCarl Hetherington <cth@carlh.net>2013-03-06 23:37:59 +0000
commit3994ec6aeb7b1dd07aeac2cd6086f6d0a68352de (patch)
tree4b61da6bbe34ce3eeb526f167bec953578cec00a /src
parent4de9464d7547954bcc74d4c1337c202dc50f588a (diff)
Fix infinite loop.
Diffstat (limited to 'src')
-rw-r--r--src/lib/matcher.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/matcher.cc b/src/lib/matcher.cc
index b2bef0269..83a39b6ee 100644
--- a/src/lib/matcher.cc
+++ b/src/lib/matcher.cc
@@ -96,7 +96,7 @@ Matcher::process_audio (boost::shared_ptr<AudioBuffers> b, double t)
if (_video_frames == 0) {
/* No video yet; we must postpone these data until we have some */
_pending_audio.push_back (AudioRecord (b, t));
- } else if (_video_frames > 0 && _audio_frames == 0) {
+ } else if (_video_frames > 0 && _audio_frames == 0 && _pending_audio.empty()) {
/* First audio since we got video */
_pending_audio.push_back (AudioRecord (b, t));
fix_start ();