summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_encoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-07-05 22:10:03 +0200
committerCarl Hetherington <cth@carlh.net>2020-07-05 22:10:03 +0200
commitcfa822570e6f2d2d09fe1c36a81b224ded07c6b6 (patch)
treea20fe3a6daca45e960808c25eb2599a9c9d13219 /src/lib/ffmpeg_encoder.cc
parentf20ec58b5fa6b5ffd49f0af6865290a775077e73 (diff)
Improve butler error reporting during export.v2.15.88
Diffstat (limited to 'src/lib/ffmpeg_encoder.cc')
-rw-r--r--src/lib/ffmpeg_encoder.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index ee49a0646..15e27e633 100644
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -166,6 +166,7 @@ FFmpegEncoder::go ()
for (int j = 0; j < gets_per_frame; ++j) {
Butler::Error e;
pair<shared_ptr<PlayerVideo>, DCPTime> v = _butler->get_video (true, &e);
+ _butler->rethrow ();
if (!v.first) {
throw ProgrammingError(__FILE__, __LINE__, String::compose("butler returned no video; error was %1", static_cast<int>(e)));
}