From patchwork Fri Sep 6 15:28:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 14961 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 2C14C449F06 for ; Fri, 6 Sep 2019 18:50:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4F1FF687F55; Fri, 6 Sep 2019 18:28:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C08F4687F55 for ; Fri, 6 Sep 2019 18:28:37 +0300 (EEST) Received: by mail-pf1-f194.google.com with SMTP id x127so4719606pfb.7 for ; Fri, 06 Sep 2019 08:28:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZgtBNeutkcz/8pSs/T/ggrV3QUW4SU/B7VIKzL1rB+8=; b=WTeS1CQM2ZOMhzDKJ/Rmz1qx4MniQniq15Xz0xGszIez69PHBticB5FM07lIFKoomV wZSKZsKnxfZJE+Q+Owc1x5UJkFwdyKSRJ9B6Pl12m1SsjsP5Ur3jU0YeSw9plC6L/I+y 88hRkNLtepdK6P7ajGmGwrFHxeKIh3mM7qJWLfqY177tKUZOXbzxbjC+BC771QkDPzn/ 8m5TqYWQtTbCctrij78ybKX9oIabMSqHjSXKvTmqBUMP9t9z9Ol6H2dXFcYnVNNOLnR0 i8bnmmeN9GQ8hzXpfWizAhN12l5bieiph8hP53v7elKAiKEAO3IQpmCLZ6HrMByVm7td IOcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZgtBNeutkcz/8pSs/T/ggrV3QUW4SU/B7VIKzL1rB+8=; b=h33xAPc8KYvybvNxjRwq5eDETSDW3OF2B+dhlyoZmTV5cMRZT2xzVnP8b75HOYU+D+ jkCzivcMkIuJOSwf8pwVSF/zWIHVoPxNN4T+d1mO800Uz7mOSDhKNF3mIIdPaG70skeU sezvuqbi/atNGyqnE3g1gzWVc6cH9Vz8azxnJWYKkP7yuYtU2Rir1eD/vJXldJfOabhH iy/G8/kvaQxQLlryg3wLUIe3TEu5o3Mag6NcCvDQLIBGQk0FIjXdN6HEH8R9sglUfzcZ mht0W3v1Q7PI+bB1y575LutbLImvgxP5YnsMMjnamixZM2qNTKVAZCrY4WjpiIeK7lij ZtLQ== X-Gm-Message-State: APjAAAVD9v+lbPqX+ihLghsHyrV31Uu+SR75S8Q5PBaJkd7pqtlRUOC8 6AWyvtJBVuqPj1KG2zN8l7wfEpeB X-Google-Smtp-Source: APXvYqxK94BlxBxyaXYrAoenHo4aW5w2aSDup+h0WZmHT7Bmyf4zx4x69I68Y8qU86u+4Ja4R24RdQ== X-Received: by 2002:a17:90a:b38a:: with SMTP id e10mr10447960pjr.91.1567783715732; Fri, 06 Sep 2019 08:28:35 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id b18sm3066737pju.16.2019.09.06.08.28.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Sep 2019 08:28:34 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Sep 2019 23:28:28 +0800 Message-Id: <20190906152829.639-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190830033752.26454-1-lance.lmwang@gmail.com> References: <20190830033752.26454-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 1/2] avcodec/v210dec: removed the duplicated 'if' condition 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/v210dec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c index 5a33d8c..6ce18aa 100644 --- a/libavcodec/v210dec.c +++ b/libavcodec/v210dec.c @@ -98,8 +98,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, return AVERROR_INVALIDDATA; } } - if ( avctx->codec_tag == MKTAG('C', '2', '1', '0') - && avpkt->size > 64 + if (avctx->codec_tag == MKTAG('C', '2', '1', '0') && AV_RN32(psrc) == AV_RN32("INFO") && avpkt->size - 64 >= stride * avctx->height) psrc += 64;