From 197cf8638286fb31c03d3b185a207204fdf02a2a Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sat, 14 Sep 2019 02:52:33 +1000 Subject: [PATCH] don't allow ffmpeg through oiio --- app/decoder/oiio/oiiodecoder.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/decoder/oiio/oiiodecoder.cpp b/app/decoder/oiio/oiiodecoder.cpp index 0b87bed77..404fea7d2 100644 --- a/app/decoder/oiio/oiiodecoder.cpp +++ b/app/decoder/oiio/oiiodecoder.cpp @@ -43,12 +43,18 @@ bool OIIODecoder::Probe(Footage *f) return false; } + if (!strcmp(in->format_name(), "FFmpeg movie")) { + // If this is FFmpeg via OIIO, fall-through to our native FFmpeg decoder + return false; + } + // Get stats for this image and dump them into the Footage file const OIIO::ImageSpec& spec = in->spec(); ImageStreamPtr image_stream = std::make_shared(); image_stream->set_width(spec.width); image_stream->set_height(spec.height); + f->add_stream(image_stream); // If we're here, we have a successful image open