projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix seek with respect to video/audio frame boundary alignment.
[dcpomatic.git]
/
src
/
lib
/
audio_merger.h
diff --git
a/src/lib/audio_merger.h
b/src/lib/audio_merger.h
index 2a1cc761b1f141aef886d3de88fb09957ec44b15..f068b504e8dcbff0c0215a146de00550480bea97 100644
(file)
--- a/
src/lib/audio_merger.h
+++ b/
src/lib/audio_merger.h
@@
-37,6
+37,8
@@
public:
TimedAudioBuffers<T>
pull (T time)
{
+ assert (time >= _last_pull);
+
TimedAudioBuffers<T> out;
F const to_return = _t_to_f (time - _last_pull);