From patchwork Tue Jan 10 16:51:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 2175 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp346933vsb; Tue, 10 Jan 2017 08:51:31 -0800 (PST) X-Received: by 10.28.19.141 with SMTP id 135mr2596208wmt.62.1484067091007; Tue, 10 Jan 2017 08:51:31 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g7si2101508wje.28.2017.01.10.08.51.30; Tue, 10 Jan 2017 08:51:30 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB08A68A4FB; Tue, 10 Jan 2017 18:51:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A1EC68A33E for ; Tue, 10 Jan 2017 18:51:13 +0200 (EET) Received: from [172.31.216.44] (helo=vie01a-pemc-psmtp-pe02) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cQzdo-0004a3-Fy for ffmpeg-devel@ffmpeg.org; Tue, 10 Jan 2017 17:51:20 +0100 Received: from [192.168.1.3] ([80.110.105.32]) by vie01a-pemc-psmtp-pe02 with SMTP @ mailcloud.upcmail.net id WgrK1u00w0hxW7C01grLur; Tue, 10 Jan 2017 17:51:20 +0100 X-SourceIP: 80.110.105.32 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Tue, 10 Jan 2017 17:51:19 +0100 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201701101751.19199.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavc/psd: Interpret duotone as grayscale X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch does what other applications do with duotone and fixes the provided sample. Please comment, Carl Eugen From 32f777d3a63007a91ab3c08990bface1bbf79be9 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 10 Jan 2017 17:49:31 +0100 Subject: [PATCH] lavc/psd: Interpret DUOTONE as GRAYSCALE. Fixes a sample from ticket #6045. --- libavcodec/psd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/psd.c b/libavcodec/psd.c index 7587ed9..a71082d 100644 --- a/libavcodec/psd.c +++ b/libavcodec/psd.c @@ -352,6 +352,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, return AVERROR_PATCHWELCOME; } break; + case PSD_DUOTONE: case PSD_GRAYSCALE: if (s->channel_count == 1) { if (s->channel_depth == 8) {