From patchwork Wed Nov 20 16:59:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 16352 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 50FE2446CB5 for ; Wed, 20 Nov 2019 19:00:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2792F68A7B8; Wed, 20 Nov 2019 19:00:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f45.google.com (mail-io1-f45.google.com [209.85.166.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3573687FD5 for ; Wed, 20 Nov 2019 18:59:56 +0200 (EET) Received: by mail-io1-f45.google.com with SMTP id r144so28399801iod.8 for ; Wed, 20 Nov 2019 08:59:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=h4ybMR3xK+JN9hZm3AEZkWzkz7re0DwsI31iaKgp9+w=; b=hyaGg8/hWPSI/u1AtsRFUbPoSJI5Y+1rZd3+FKJoh+fX7L2DTt/8Z4+wLAZHjH8TUo O0RmRnsnlwlwQiCEkWFTr0OBgqlDQyPyLvnsltiEQamTKpQQgBBLks+qSaKt989UJeiV LCCghFHug5kdP07JW8RE7RKq4HXQTFpnNVWZQ8mdsg5lrmuvg3Fdj+S/1AmO2e0xTti3 IJTc0kSpTrz7Y4r8dUTI46uQkvxpFsURk4pE1jV28WWynO4GAIwuCb9x/RUhhcZDQEe+ 8xSva23psvJDiPzw7VEMl70XpYjCKiW2/COPf8xR/3GaHxXOA9X9dcrslwjr35NnkiJk XiYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=h4ybMR3xK+JN9hZm3AEZkWzkz7re0DwsI31iaKgp9+w=; b=PLUU2FPOcMxORHdPga1y/Nd1t5/7JBrVUEpclDXP9YnVbu0RRXtu09+8vY8aK5QcpK O5rjUPIom9t/vyUSZn+3HwpUEt7FPJ6F/BGZbLJ67JfDAyhGJoO9DsttjG14tIABGAmU Ddny9tNIlRHBCSVHwyYi7Ic9QvhNU5PwDq1rqeokwNqsu+JwYbXsZecmge+8lhfRTP7z zTdsa13JpSmIp1WPiIMwYF4ER+LPkOqwILEHbZaku0iDlaETEKSI5Vrbg3C2JGW1GR6D 99rRSsuossQWtKYNng2sJw3iPCwCeLPgeizpYEwpCqkbZe8ERpWCHLc7OSMifcEOm1gq 6Iwg== X-Gm-Message-State: APjAAAVpeizjPAeSsPLRP/CZswgb0cMTzKby9+tkojy4+8RyY982qn/Y 1Qv1GWQqDvEdUx6mSGsxMbVTQM7udAuJ9s14FsVgBw== X-Google-Smtp-Source: APXvYqyn8W3zbLJ2NQkjzq+9Y+fGMSow7akQVRB4/xIh5VWtlqTBVoAAzE7r7zxW6wHUTiqGDga3jug60Gy7G2qD054= X-Received: by 2002:a02:c4cf:: with SMTP id h15mr4068530jaj.112.1574269194702; Wed, 20 Nov 2019 08:59:54 -0800 (PST) MIME-Version: 1.0 From: Carl Eugen Hoyos Date: Wed, 20 Nov 2019 17:59:43 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/dpx: Two possible patches to fix 10bit gray images 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 are two patches that fix ticket #8390, I would prefer not to add more special cases but others may disagree. Please comment, Carl Eugen From f9e368fe415ee009aee9b9e8ba516a64259a6516 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Wed, 20 Nov 2019 17:51:08 +0100 Subject: [PATCH] lavc/dpx: Assume that all 10bit gray images have no line padding. Fixes ticket #8390. --- libavcodec/dpx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index b1833ed9ef..be7481dbaa 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -422,7 +422,7 @@ static int decode_frame(AVCodecContext *avctx, read10in32(&buf, &rgbBuffer, &n_datum, endian, shift); } - if (memcmp(input_device, "Scanity", 7)) + if (elements > 1) n_datum = 0; for (i = 0; i < elements; i++) ptr[i] += p->linesize[i]; -- 2.23.0