summaryrefslogtreecommitdiff
path: root/src/lib/audio_merger.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-12-18 12:09:35 +0000
committerCarl Hetherington <cth@carlh.net>2013-12-18 12:09:35 +0000
commit060a980527bc0b39e12494fec3c0baaab4c9d086 (patch)
tree82de7bbcf605543be583b2ed3daf22d8145f6657 /src/lib/audio_merger.h
parente0c59417c6a52dbd853114fbc0f88c6d8c1dd276 (diff)
Fix seek with respect to video/audio frame boundary alignment.
Diffstat (limited to 'src/lib/audio_merger.h')
-rw-r--r--src/lib/audio_merger.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/audio_merger.h b/src/lib/audio_merger.h
index 2a1cc761b..f068b504e 100644
--- 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);