From c29de33e6f8b20219a957a0cd88d61fd8cba1ad9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 11 Oct 2021 10:51:43 +0200 Subject: Don't throw an error when the Butler says it is finished (#2097). --- src/lib/ffmpeg_encoder.cc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/lib/ffmpeg_encoder.cc') diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index dd773168a..5db3e31a6 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -178,12 +178,15 @@ FFmpegEncoder::go () Butler::Error e; auto v = _butler->get_video (true, &e); _butler->rethrow (); - if (!v.first) { - throw DecodeError(String::compose("Error during decoding: %1", e.summary())); - } - auto fe = encoder->get (v.first->eyes()); - if (fe) { - fe->video(v.first, v.second - reel->from); + if (v.first) { + auto fe = encoder->get (v.first->eyes()); + if (fe) { + fe->video(v.first, v.second - reel->from); + } + } else { + if (e.code != Butler::Error::Code::FINISHED) { + throw DecodeError(String::compose("Error during decoding: %1", e.summary())); + } } } -- cgit v1.2.3