From 4313ed511a31ad44c267fc0766ccc0e8daa9fc3f Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Wed, 11 Jan 2017 00:17:59 +0100
Subject: [PATCH] lavc/psd: Interpret DUOTONE as GRAYSCALE.
This is what gimp, ImageMagick and FreeImage do and what the
Adobe Photoshop file format specification suggests.
Fixes a sample from ticket #6045.
Reviewed-by: Martin Vignali
---
libavcodec/psd.c | 2 ++
libavcodec/version.h | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavcodec/psd.c b/libavcodec/psd.c
index 7587ed9c805..a4830c654fa 100644
--- a/libavcodec/psd.c
+++ b/libavcodec/psd.c
@@ -352,6 +352,8 @@ static int decode_frame(AVCodecContext *avctx, void *data,
return AVERROR_PATCHWELCOME;
}
break;
+ case PSD_DUOTONE:
+ av_log(avctx, AV_LOG_WARNING, "ignoring unknwon duotone specification.\n");
case PSD_GRAYSCALE:
if (s->channel_count == 1) {
if (s->channel_depth == 8) {
diff --git a/libavcodec/version.h b/libavcodec/version.h
index c5a8f55897b..7f1b0a4638f 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 71
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
--
GitLab