From patchwork Mon Sep 16 15:34:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 15100 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 690C9445AFD for ; Mon, 16 Sep 2019 18:34:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4412B687EB4; Mon, 16 Sep 2019 18:34:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BCA8680C0D for ; Mon, 16 Sep 2019 18:34:14 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id r3so9242575wrj.6 for ; Mon, 16 Sep 2019 08:34:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=7wgDnEiRO6NZjozOYPlFKBVVjSBW/ESqGaL2GekyUgM=; b=WLYQRfI8h8dpcaZGl3FWx28Ht0zFn1mQTI47tqTtZ8CG+PVVKCWlzy78NLZEu8toI+ nzaGe9MFx+AxJfp/SUxUfThZ8grE4Nn3sTZH3FKn38rwHZ3yHZLB28Uzn+UuM673mf+i S6yHGT1EnYgoh6238no5eB20MidZXbn6AifK3xsqjCJieBg7t9DYcfcdsKk3gLWvuHj8 7y3aJUb1IecDzolVUSQr8Sl45YdsJYQsJ4lKrybw3zY0HUU11lXgvH/BIZLxaZoviV+R Ibd0uxEvjg9cZKoELAEXpMN2OM+GWps+rEN2h59rmbI/v3bOU9f8mfG0au4TbQ7r7LEl xWOg== 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=7wgDnEiRO6NZjozOYPlFKBVVjSBW/ESqGaL2GekyUgM=; b=tDO+kGHWK459srH47ZEMPZ5xd3MPWnSpDfTIT8+QzU4862VJQRVTBL1btNI1lD9IdA nVYT4lSD4O6malESwbNfTTjrEbytedoMnq0abM2JJtt1wQlhPBnTm9KS18+TH4sYFMyk ShL2k+EvVNBgd2lbRq+ZMrTRZhvsP9vAp6EWLsEuZlOSdo97a9at0naz+FSjeJEdJF1Z Y7v78spDysnnc2IPwRt9isTqrgEsJp39TsQbjYAA4SiJ8H4TDnLNL6rfJ9JDftIFqJF6 6qfum+R2PWZwUlO/b1/cZq61INECf14wEfSB8W4vJka0oNpdDwgRQbESrDY+cZ91fJqK GXTA== X-Gm-Message-State: APjAAAUTwwGpTZG6qgqft2lK19i6w5xxt0BPfol2MPz49hfW+yQIntnX tguwd1PN7VTZ4EH/d4bHALUXWTkv/cY= X-Google-Smtp-Source: APXvYqzhteIm9opLaFvU0y1g6671mTmg+7Mkkn1ESqzv0PJ+S0HTPMrLum9q5lt0OHQ++r3zpiiLOA== X-Received: by 2002:a5d:430f:: with SMTP id h15mr298458wrq.177.1568648053637; Mon, 16 Sep 2019 08:34:13 -0700 (PDT) Received: from localhost.localdomain ([77.237.106.98]) by smtp.gmail.com with ESMTPSA id i14sm17213599wra.78.2019.09.16.08.34.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Sep 2019 08:34:12 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Sep 2019 17:34:05 +0200 Message-Id: <20190916153405.10364-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodecc/dnxhddec: fix ACT checking 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" Signed-off-by: Paul B Mahol --- libavcodec/dnxhddec.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c index 1e95086696..512accadfd 100644 --- a/libavcodec/dnxhddec.c +++ b/libavcodec/dnxhddec.c @@ -499,19 +499,17 @@ static int dnxhd_decode_macroblock(const DNXHDContext *ctx, RowContext *row, qscale = get_bits(&row->gb, 11); } act = get_bits1(&row->gb); - if (act) { - if (!ctx->act) { - static int act_warned; - if (!act_warned) { - act_warned = 1; - av_log(ctx->avctx, AV_LOG_ERROR, - "ACT flag set, in violation of frame header.\n"); - } - } else if (row->format == -1) { - row->format = act; - } else if (row->format != act) { - row->format = 2; // Variable + if (ctx->act != act) { + static int act_warned; + if (!act_warned) { + act_warned = 1; + av_log(ctx->avctx, AV_LOG_ERROR, + "ACT flag set, in violation of frame header.\n"); } + } else if (row->format == -1) { + row->format = act; + } else if (row->format != act) { + row->format = 2; // Variable } if (qscale != row->last_qscale) {