Another macOS std::list boost::thread SNAFU.

[dcpomatic.git] / src / lib / ffmpeg_image_proxy.cc

diff --git a/src/lib/ffmpeg_image_proxy.cc b/src/lib/ffmpeg_image_proxy.cc
index 87925dabc9360f660115f00d7d668dac0cd3b086..9c91d1d87d7d6c60eb883ee346acbb14876bf5ee 100644 (file)
--- a/src/lib/ffmpeg_image_proxy.cc
+++ b/src/lib/ffmpeg_image_proxy.cc
@@ -134,20 +134,22 @@ FFmpegImageProxy::image (optional<dcp::Size>) const
        av_dict_set (&options, "probesize", raw_convert<string>(5 * 60 * 1000000).c_str(), 0);
 
        int e = avformat_open_input (&format_context, 0, 0, &options);
+       if ((e < 0 && e == AVERROR_INVALIDDATA) || (e >= 0 && format_context->probe_score <= 25)) {
+               /* Hack to fix loading of .tga files through AVIOContexts (rather then
+                  directly from the file).  This code just does enough to allow the
+                  probe code to take a hint from "foo.tga" and so try targa format.
+               */
+               AVInputFormat* f = av_find_input_format ("image2");
+               format_context = avformat_alloc_context ();
+               format_context->pb = avio_context;
+               format_context->iformat = f;
+               e = avformat_open_input (&format_context, "foo.tga", f, &options);
+       }
        if (e < 0) {
-               if (e == AVERROR_INVALIDDATA) {
-                       /* Hack to fix loading of .tga files through AVIOContexts (rather then
-                          directly from the file).  This code just does enough to allow the
-                          probe code to take a hint from "foo.tga" and so try targa format.
-                       */
-                       AVInputFormat* f = av_find_input_format ("image2");
-                       format_context = avformat_alloc_context ();
-                       format_context->pb = avio_context;
-                       format_context->iformat = f;
-                       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, OpenFileError::READ);
+               } else {
+                       boost::throw_exception(DecodeError(String::compose(_("Could not decode image (%1)"), e)));
                }
        }