projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1c5ffd1
)
Fix crash when processing audio before time 0.
author
Carl Hetherington
<cth@carlh.net>
Sun, 29 Dec 2013 20:50:28 +0000
(20:50 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Sun, 29 Dec 2013 20:50:28 +0000
(20:50 +0000)
src/lib/player.cc
patch
|
blob
|
history
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index 037af6f4e1041003e065b305766018a28d03cd7f..600b8dbc29cb70ed23d0928a19e937357fda9158 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-130,7
+130,7
@@
Player::pass ()
}
if (earliest_audio != TIME_MAX) {
- TimedAudioBuffers<DCPTime> tb = _audio_merger.pull (
earliest_audio
);
+ TimedAudioBuffers<DCPTime> tb = _audio_merger.pull (
max (0L, earliest_audio)
);
Audio (tb.audio, tb.time);
/* This assumes that the audio_frames_to_time conversion is exact
so that there are no accumulated errors caused by rounding.