From patchwork Tue Jun 2 15:16:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20100 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 92B0544A686 for ; Tue, 2 Jun 2020 18:23:05 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8026A68B010; Tue, 2 Jun 2020 18:23:05 +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 C2E4E68AFE6 for ; Tue, 2 Jun 2020 18:23:03 +0300 (EEST) Received: by mail-pf1-f194.google.com with SMTP id f3so5181881pfd.11 for ; Tue, 02 Jun 2020 08:23:03 -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=W8JLzhFiag+WW0iOLySjTERJ7HTiw72Kg4S4T9s/S+Y=; b=o7Dhgl8UTnX3ekEEzGHIDZj/La0GPYqdJshyx1llzVtm5t0fn422d6OzheAnoK1WGQ 8Aag7Ihqs7lah92S2ns0vSEoGixCr2S39rB8L2X0fe9PqB0jOkk7063CyQHLhP8+q6zC g6Rx7wkBLbJItm5+IRV5xaTm2TGc5STjR5qkhtd/lPH94+bzJef2v/4h7hHonIVjTnd9 H5DAyQhGqYvH8qMUp2UxNa1okjeugsJ2Ptt40Ohoov5Ow5vjJhonY71+ou3+bOzQpuJk jJBliaBkOoDrmkKdC+r1p6qpY8KI6/VlBBRDzpkbqdNKkmveHQB2nhDTNOL7nerENJ/M Rmdw== 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=W8JLzhFiag+WW0iOLySjTERJ7HTiw72Kg4S4T9s/S+Y=; b=VSDElcwYMLN5RYQOBgDczOJKBv12ogVAR6pzjyXrH6FaD/RrZgile4bK02JkCfLFtX 56fNBtGG4BssuST8b3qf3KxWZA/t19dkElEWF0Oo+pvGdmOXtfpcmKxLwYhhO0n3Qpep 3cbQMpYLpUlBH/IKHcLmkO0gY3iIXwSnulLxn+WUZm4pGMXoMHKrBBX+KJdMA6DqOJSx Gq5TdACOzj/m+vA2CwkgRWnjg+3z+rJvfvOi+vF3fP806NkfNMtD69EqhR06lpXCVzFZ Iyk0GTFrFAI1GP3V1Q5nRlmdygWY7OzO0XHqMXjNaCn8R90RQKrlUdmMermjCi6slJx/ I/nQ== X-Gm-Message-State: AOAM530t2VrCahTyXBXrudtfqdoWF44zbH29+icabciUzNujLxKjNxFP yiJO0346BR8s/ohUxBuuePnxjvvJ X-Google-Smtp-Source: ABdhPJxHdCLFLaCjUtVRaoL6Is7SpWgw1vxIL8rOB1RpK+i5UPp2w5xm/26Fb/tdyFXDWoAwgD7a1A== X-Received: by 2002:a63:348:: with SMTP id 69mr23542630pgd.68.1591111040337; Tue, 02 Jun 2020 08:17:20 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id b15sm2958089pjb.18.2020.06.02.08.17.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jun 2020 08:17:19 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 23:16:29 +0800 Message-Id: <1591111034-15499-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1590674250-32571-1-git-send-email-lance.lmwang@gmail.com> References: <1590674250-32571-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 01/24] avcodec/h264dec: cosmetics 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/h264dec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 6270ea8..4d8c0b1 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -253,8 +253,7 @@ int ff_h264_slice_context_init(H264Context *h, H264SliceContext *sl) if (sl != h->slice_ctx) { memset(er, 0, sizeof(*er)); - } else - if (CONFIG_ERROR_RESILIENCE) { + } else if (CONFIG_ERROR_RESILIENCE) { /* init ER */ er->avctx = h->avctx;