From ea03f295ec79ee72d3c7a6af4e4abcda70b9a423 Mon Sep 17 00:00:00 2001 From: Martin Vignali Date: Sat, 17 Feb 2018 20:44:12 +0100 Subject: [PATCH] avcodec/exr : add support for long name flag and be more explicit about unsupported flag based-on patch by Carl Eugen Hoyos Fix ticket 6994 --- libavcodec/exr.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 47f59bd638..444af17778 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1350,12 +1350,14 @@ static int decode_header(EXRContext *s, AVFrame *frame) flags = bytestream2_get_le24(&s->gb); - if (flags == 0x00) - s->is_tile = 0; - else if (flags & 0x02) + if (flags & 0x02) s->is_tile = 1; - else{ - avpriv_report_missing_feature(s->avctx, "flags %d", flags); + if (flags & 0x08) { + avpriv_report_missing_feature(s->avctx, "deep data"); + return AVERROR_PATCHWELCOME; + } + if (flags & 0x10) { + avpriv_report_missing_feature(s->avctx, "multipart"); return AVERROR_PATCHWELCOME; }