From patchwork Wed Dec 5 13:27:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 11286 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 EEDFC44C90C for ; Wed, 5 Dec 2018 15:28:23 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9C7D368A62F; Wed, 5 Dec 2018 15:28:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E913F68A450 for ; Wed, 5 Dec 2018 15:28:09 +0200 (EET) Received: by mail-wm1-f47.google.com with SMTP id y139so13196681wmc.5 for ; Wed, 05 Dec 2018 05:28:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=YcSAi/NrkWSUGlGQ52WWsFNoqBodA5kFhM0m+OzKiaI=; b=YTiCufn/0QGkHe15zZe9/9DilktyOuAfSnY07qD9wRf8n491jpbQmF6R/arlFsw86U Lw8Xq7FYKTWsKNTyLlhwMvSHDCL+6ruuzfM1W9EAaBrTD/jdUr1OtQuhDw1If1qieBoW ABraSg9oz27na2NuIaD/2ZCHufoYVEB/ROeH8yYqrsbL+AskTMpVVvxy1z26u17HRexD IPJH6FbCqafEOaFeB/rPocg9rBrg0XwMVabv47igDAmTkw+zUfVnok9F+sridkemtejP ny/kZL+RFfMe3gVquuBKjwHPokP3RbuGIMmuYF5ClrRR7TALf7mTCL9+ayE+5D3bc3b4 8+Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=YcSAi/NrkWSUGlGQ52WWsFNoqBodA5kFhM0m+OzKiaI=; b=LhxcABIYJWHIWsCwOE2aXtei3Mm6nqOTqRacMN/h85yteeuzBojZm2qFYRx0lE5nYD //vFhcHt103huRCKKZf7ZEv5+OObuwLioPsjl8WtTCTPcKWVQrkbVF/WwOs0/ZVbWPLD 8VUQM/8E8yX4WbOPNGe/r4cOs+DKzYKKmcI5UchaJC8E/p+TV3yTKi0cx0vG5e/KPbNf Slgwkk8Ujk9gNIHKzPhkWDGlIk4eNZA4vvdPAsgV4OXKMcNXkbHeHBWkJy1szEW/CAI5 7TJukMH3vjEnPmufk+HqCZAa2YNeU6wt9own4HVb86w+AJ6zdTR9l46b3ewXxYrQqxJF Ty2A== X-Gm-Message-State: AA+aEWaXOP5/OU09dGsALIUWkV1bKmXA8eSFJdboifTf0t+QE9fmTmqe lkEFRhJUWzaIymojA9rjz43PB4Cx X-Google-Smtp-Source: AFSGD/UEBdhQqb3j9a0FLH5DZScsXPeyWlIqw9CYM6YlameklevmegzQUh4XOuSUIHHF0vQTo9a1tg== X-Received: by 2002:a1c:e58c:: with SMTP id c134mr15519572wmh.124.1544016498100; Wed, 05 Dec 2018 05:28:18 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id z8sm18284756wrr.52.2018.12.05.05.28.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Dec 2018 05:28:17 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Dec 2018 14:27:58 +0100 Message-Id: <20181205132758.11233-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodec/dpx: do not reset n_datum to 0 at end of row for packing 2 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes #4409. Signed-off-by: Paul B Mahol --- libavcodec/dpx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index 538a1b9943..04b55ffadf 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -378,7 +378,8 @@ static int decode_frame(AVCodecContext *avctx, read10in32(&buf, &rgbBuffer, &n_datum, endian, shift); } - n_datum = 0; + if (packing != 2) + n_datum = 0; for (i = 0; i < elements; i++) ptr[i] += p->linesize[i]; }