From 019fd78b3bdf4bf1d8944df879d6c0e7a8b1cd67 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 11 Jun 2015 16:24:36 +0100 Subject: Check for J2K data before checking for similarity of frames; fixes #599. --- src/lib/encoder.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/encoder.cc') diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 6eb295412..d0764ac35 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -221,11 +221,11 @@ Encoder::enqueue (shared_ptr pv) /* We can fake-write this frame */ _writer->fake_write (_video_frames_enqueued, pv->eyes ()); frame_done (); - } else if (_last_player_video && pv->same (_last_player_video)) { - _writer->repeat (_video_frames_enqueued, pv->eyes ()); } else if (pv->has_j2k ()) { /* This frame already has JPEG2000 data, so just write it */ _writer->write (pv->j2k(), _video_frames_enqueued, pv->eyes ()); + } else if (_last_player_video && pv->same (_last_player_video)) { + _writer->repeat (_video_frames_enqueued, pv->eyes ()); } else { /* Queue this new frame for encoding */ LOG_TIMING ("adding to queue of %1", _queue.size ()); -- cgit v1.2.3