projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4647b61
)
Increase stored-frames limit; fix skip_frame_test reference.
author
Carl Hetherington
<cth@carlh.net>
Mon, 5 Jan 2015 14:40:38 +0000
(14:40 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 5 Jan 2015 14:40:38 +0000
(14:40 +0000)
src/lib/video_decoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/video_decoder.cc
b/src/lib/video_decoder.cc
index efcbb05ad3dbdca68a0683a6684636b333ce4aec..1bb460da357c2b28c21b3eac7f21c8d93450702b 100644
(file)
--- a/
src/lib/video_decoder.cc
+++ b/
src/lib/video_decoder.cc
@@
-290,8
+290,10
@@
VideoDecoder::video (shared_ptr<const ImageProxy> image, VideoFrame frame)
copy (to_push.begin(), to_push.end(), back_inserter (_decoded_video));
- /* We can't let this build up too much or we will run out of memory */
- DCPOMATIC_ASSERT (_decoded_video.size() < 32);
+ /* We can't let this build up too much or we will run out of memory. We need to allow
+ the most frames that can exist between blocks of sound in a multiplexed file.
+ */
+ DCPOMATIC_ASSERT (_decoded_video.size() <= 96);
}
void