aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Vignali <martin.vignali@gmail.com>2018-02-17 20:44:12 +0100
committerMartin Vignali <martin.vignali@gmail.com>2018-02-24 21:42:04 +0100
commitea03f295ec79ee72d3c7a6af4e4abcda70b9a423 (patch)
treeecb3cb8d6ea644b154694a713420fb0a6858d505
parentffabff1baa0873a2aa9c0c09ec93b2f4191493b5 (diff)
downloadffmpeg-ea03f295ec79ee72d3c7a6af4e4abcda70b9a423.tar.gz
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
-rw-r--r--libavcodec/exr.c12
1 files 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;
}