projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
de6798c
)
Re-throw butler errors at the end of an encode.
author
Carl Hetherington
<cth@carlh.net>
Tue, 18 Feb 2020 22:45:20 +0000
(23:45 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 18 Feb 2020 22:45:20 +0000
(23:45 +0100)
src/lib/ffmpeg_encoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/ffmpeg_encoder.cc
b/src/lib/ffmpeg_encoder.cc
index 0233632d71e04f08deb0de325435555689e5e21d..68575d11adc072c69b9a2bc1e16f93a223fd1b0f 100644
(file)
--- a/
src/lib/ffmpeg_encoder.cc
+++ b/
src/lib/ffmpeg_encoder.cc
@@
-181,6
+181,8
@@
FFmpegEncoder::go ()
BOOST_FOREACH (FileEncoderSet i, _file_encoders) {
i.flush ();
}
+
+ _butler->rethrow ();
}
float