diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-02-18 22:46:57 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-02-18 22:46:57 +0100 |
| commit | 93e6b592e82f56fc44a941a323864220499c8ed6 (patch) | |
| tree | a6ad9eed1eb73feaebce15ce7dc7ccdc7cfbdaad | |
| parent | 648b8ed1987f4a254a71fca4c2c420ab9a9e80f1 (diff) | |
| parent | ca21cc2099526b68b9663d39c4e402c7faee7c5e (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
| -rw-r--r-- | src/lib/ffmpeg_encoder.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc index 4614903db..0233632d7 100644 --- a/src/lib/ffmpeg_encoder.cc +++ b/src/lib/ffmpeg_encoder.cc @@ -141,7 +141,11 @@ FFmpegEncoder::go () } for (int j = 0; j < gets_per_frame; ++j) { - pair<shared_ptr<PlayerVideo>, DCPTime> v = _butler->get_video (); + Butler::Error e; + pair<shared_ptr<PlayerVideo>, DCPTime> v = _butler->get_video (&e); + if (!v.first) { + throw ProgrammingError(__FILE__, __LINE__, String::compose("butler returned no video; error was %1", static_cast<int>(e))); + } shared_ptr<FFmpegFileEncoder> fe = encoder->get (v.first->eyes()); if (fe) { fe->video(v.first, v.second); |