Give a better error when FFmpegImageProxy fails to decode an image that was passed...
authorCarl Hetherington <cth@carlh.net>
Fri, 15 Mar 2019 22:37:47 +0000 (22:37 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 15 Mar 2019 22:37:47 +0000 (22:37 +0000)
src/lib/ffmpeg_image_proxy.cc

index 3548117..33c619a 100644 (file)
@@ -146,7 +146,12 @@ FFmpegImageProxy::image (optional<dcp::Size>) const
                e = avformat_open_input (&format_context, "foo.tga", f, &options);
        }
        if (e < 0) {
-               throw OpenFileError (_path->string(), e, true);
+               if (_path) {
+                       throw OpenFileError (_path->string(), e, true);
+               } else {
+                       /* XXX: this needs to be marked translatable after the string freeze is over */
+                       boost::throw_exception(DecodeError(String::compose("Could not decode image (%1)", e)));
+               }
        }
 
        if (avformat_find_stream_info(format_context, 0) < 0) {