summaryrefslogtreecommitdiff
path: root/src/lib/video_decoder.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/video_decoder.cc')
-rw-r--r--src/lib/video_decoder.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 4b9272413..efc0ecf11 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -318,10 +318,14 @@ VideoDecoder::video (shared_ptr<const ImageProxy> image, Frame 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. We need to allow
- the most frames that can exist between blocks of sound in a multiplexed file.
+ /* We can't let this build up too much or we will run out of memory. There is a
+ `best' value for the allowed size of _decoded_video which balances memory use
+ with decoding efficiency (lack of seeks). Throwing away video frames here
+ is not a problem for correctness, so do it.
*/
- DCPOMATIC_ASSERT (_decoded_video.size() <= 96);
+ while (_decoded_video.size() > 96) {
+ _decoded_video.pop_back ();
+ }
}
void