diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-07-24 22:14:31 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-07-24 22:14:31 +0100 |
| commit | 7ba331621429d3516ba48a4585e58f1f6fa76cdf (patch) | |
| tree | 15a386afd66bf02307f18c9da232387f08aaf835 /src/lib/video_decoder.cc | |
| parent | 5807c8a5f7baec5355a2bae2771f197989001c92 (diff) | |
Fix mistaken clamp to length_after_trim after adding trim_start.
Diffstat (limited to 'src/lib/video_decoder.cc')
| -rw-r--r-- | src/lib/video_decoder.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index cdf8bc12a..944b1b695 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -285,14 +285,11 @@ VideoDecoder::video (shared_ptr<const ImageProxy> image, Frame frame) to = to_push.front().frame; } - /* It has been known that this method receives frames out of order; at this - point I'm not sure why, but we'll just ignore them. + /* If we've pre-rolled on a seek we may now receive out-of-order frames + (frames before the last seek time) which we can just ignore. */ if (from && to && from.get() > to.get()) { - _video_content->film()->log()->log ( - String::compose ("Ignoring out-of-order decoded frame %1 after %2", to.get(), from.get()), Log::TYPE_WARNING - ); return; } |
