Better errors if butler doesn't give video during export.

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 6b3118537694ba6e64dacaac0d9edf093789fd18..61e489f071c112e6d092438430ba919e83654a2d 100644 (file)
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -152,7 +152,11 @@ FFmpegEncoder::go ()
                }
 
                for (int j = 0; j < gets_per_frame; ++j) {
-                       pair<shared_ptr<PlayerVideo>, DCPTime> v = _butler->get_video (true, 0);
+                       Butler::Error e;
+                       pair<shared_ptr<PlayerVideo>, DCPTime> v = _butler->get_video (true, &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);