summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-08-23 10:38:59 +0100
committerCarl Hetherington <cth@carlh.net>2013-08-23 10:38:59 +0100
commit57796599a3acc10feebcbc87da70daf4d0af04f6 (patch)
tree72e5c58258d5a34a5054dfe422bba24b0a5c7184 /src/lib
parentbed373d380d35294b03d228a2ef41cfa8fceb4b0 (diff)
Fix hang on attempt to emit zero frames of silence.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/player.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index ebc810214..bae00d348 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -564,6 +564,10 @@ Player::emit_black ()
void
Player::emit_silence (OutputAudioFrame most)
{
+ if (most == 0) {
+ return;
+ }
+
OutputAudioFrame N = min (most, _film->audio_frame_rate() / 2);
shared_ptr<AudioBuffers> silence (new AudioBuffers (_film->audio_channels(), N));
silence->make_silent ();