Skip to content
Snippets Groups Projects
Commit 4313ed51 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos
Browse files

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
parent daff04bd
No related branches found
No related tags found
No related merge requests found
...@@ -352,6 +352,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, ...@@ -352,6 +352,8 @@ static int decode_frame(AVCodecContext *avctx, void *data,
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
break; break;
case PSD_DUOTONE:
av_log(avctx, AV_LOG_WARNING, "ignoring unknwon duotone specification.\n");
case PSD_GRAYSCALE: case PSD_GRAYSCALE:
if (s->channel_count == 1) { if (s->channel_count == 1) {
if (s->channel_depth == 8) { if (s->channel_depth == 8) {
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 57 #define LIBAVCODEC_VERSION_MAJOR 57
#define LIBAVCODEC_VERSION_MINOR 71 #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, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment