From patchwork Fri Aug 30 03:37:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 14807 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 912984491A3 for ; Fri, 30 Aug 2019 06:38:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6233F687F27; Fri, 30 Aug 2019 06:38:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B112680A7D for ; Fri, 30 Aug 2019 06:38:14 +0300 (EEST) Received: by mail-pl1-f195.google.com with SMTP id az1so1686831plb.6 for ; Thu, 29 Aug 2019 20:38:14 -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; bh=EZe+GE1YV93i1XRD45XKweYV2E4yZfRMxlbz61taPPM=; b=H3yEqZ+Qd99Hy2RsbupU7UIWZYRGAd8QkfQNeUjg1K7VOq1smyb+mRspA7KGqqODuW 1lbaBW+fJsx0pG4TL32UCYmHPFL1q7SXP0BXf+VkaRu7WbBCUfSZt32kiXBkAWwlzN9V QZErfwCI92mUjFf0X00eH9hyOQZDi3+3VE79m2t333hre9zuAqO2HpFit7ndX4cvhCnE EaFmAZGhZuIkgQ02Am4ogMXBH2ekOtjd8SLl5yU7011tfuBkrIxIPZmycSXUJZVzs+98 qhNEaaMvxsgLvWWDf1hiyOda4eosyKg9UyBMpuvmybumDTdVa7j7PfsZ6VaRH/u2ThLy a0XQ== 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; bh=EZe+GE1YV93i1XRD45XKweYV2E4yZfRMxlbz61taPPM=; b=Am7mxxREsm26bkyg7/gi52g9fl+w5JwZbTaX7RUU1wIrr9DumIWydbKQt4q3p+/KT4 hSYcmENlWUMm5PIGQyya3R8zkUv5h61KASvpnzq9P4Cp1Ah7AUuFVh1XyTRv5BLJADQV TSvvsOkuMMq7jiQxzx0aRGV4NLojclRJ2t9XuK5+A9IhB8bmH7YEo2yDXwulQTiBvTDn 90Sv1wV+jkbeBsYl4An1TztsINAG9mUuLJFBhh4RYeBBxD4r4d6OGyMGdMDwlfO/iOz1 8n+2sG35o+eKKczbONYKGsegm1RXTHgi+wfEmn6iIu9sYvptchcvn8EQrQSwJj2a2mhH 73HQ== X-Gm-Message-State: APjAAAVW1oNRE27AXPj40P091rSa7KAKUXrQwuE8ind12TUBaA3b1bw4 RcGl+qS11fxkD0h2YJBtT5rtEF38 X-Google-Smtp-Source: APXvYqwV1EUXSZG8L8NxewDadP5xL9un3XT5QiORX3u+nqN+a3R160mxW0DS/Ux8Df9ARM8TvkTl6w== X-Received: by 2002:a17:902:3064:: with SMTP id u91mr13542517plb.85.1567136292244; Thu, 29 Aug 2019 20:38:12 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id v67sm7117184pfb.45.2019.08.29.20.38.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Aug 2019 20:38:11 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Aug 2019 11:37:51 +0800 Message-Id: <20190830033752.26454-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1 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 5a33d8c089..6ce18aab5a 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;