[FFmpeg-cvslog] lavc/psd: Interpret DUOTONE as GRAYSCALE.
Carl Eugen Hoyos
git at videolan.org
Wed Jan 11 01:19:12 EET 2017
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Jan 11 00:17:59 2017 +0100| [4313ed511a31ad44c267fc0766ccc0e8daa9fc3f] | committer: Carl Eugen Hoyos
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
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4313ed511a31ad44c267fc0766ccc0e8daa9fc3f
---
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 7587ed9..a4830c6 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 c5a8f55..7f1b0a4 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, \
More information about the ffmpeg-cvslog
mailing list