diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2017-01-11 00:17:59 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2017-01-11 00:17:59 +0100 |
| commit | 4313ed511a31ad44c267fc0766ccc0e8daa9fc3f (patch) | |
| tree | f8a69984f7335a5aad4236f5784334fa30ffe1e1 | |
| parent | daff04bd1837442286fcb6b58546a2cc7f5b589d (diff) | |
| download | ffmpeg-4313ed511a31ad44c267fc0766ccc0e8daa9fc3f.tar.gz | |
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
| -rw-r--r-- | libavcodec/psd.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/psd.c b/libavcodec/psd.c index 7587ed9c80..a4830c654f 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 c5a8f55897..7f1b0a4638 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, \ |