From patchwork Sat Oct 7 00:40:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44192 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e24:b0:15d:8365:d4b8 with SMTP id gk36csp161188pzb; Fri, 6 Oct 2023 17:39:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE5U8+7edOZ1tfoyjcdXvcYzqxGOLkyNrWpzLhf5/W6hLlgBad5rCN0ZO9q6Kd47L6xvuvS X-Received: by 2002:adf:dd83:0:b0:314:15b7:20a5 with SMTP id x3-20020adfdd83000000b0031415b720a5mr8729557wrl.54.1696639191725; Fri, 06 Oct 2023 17:39:51 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a16-20020aa7cf10000000b00530b4d36674si2011389edy.68.2023.10.06.17.39.51; Fri, 06 Oct 2023 17:39:51 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=KvOHcSum; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 07C6768CAA7; Sat, 7 Oct 2023 03:39:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2106.outbound.protection.outlook.com [40.92.89.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8263D68CBA2 for ; Sat, 7 Oct 2023 03:39:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OUh4hSRAeLtEr7Ac60OJ9pbHjcCLGZ30bpnuDaMTFVvteIzMKnscuvWzs+mbGDGlUIORmYH1nNePG6m3xgbOoeIOiVRj/pAqbfPt82ye3ANdnfJJk1ltTdAzXa1uhZHkbYdHvoF1GTzi6+HwK+fteVdT1qiRDcmXBD4tmha9ciJ8MdLwrVUpdLGEXuT3EEiZstr7Wc7xjtP3hSHEC6i8nxEQgolj0vNPmtG8mq1vW4FM1LLDIkOmCN0arp1FLZQgsNlII91Lx+7q8zzCXJXiMuE4nlSv0DSqMS1CSxpdXOemaQ5L/+0C64rLtq3IcIKW02KgKjd651ova4nnv0928Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wbWw9d7iR+ftwbOCMRuLFJkZK0tYoUd16eGpowT2kEU=; b=L/Wo74ZBhNN6jX1fy8E7iQm6+VgrV8r7uI5rjObNM8MSkVIN5AjnyU/NgyCE5rYTUDGpo1cicjajQi7DnzZ2E8oeKgMdRXUm2gCGC0yNnmKRJdbVrdB/o4ff+I6zujH6iDyHvJCGQTBIB89Id1QlPKSCMEkxilYCKbEU/biU1zCDAxLr4K9GtjqRFafK9y+SQXNKl66dZZvdkZU03hRlWVM8i81KSdZ8OAFhYw2yhfK1Rk82zAfqgI5bizEeMu4kgLXcjPZG1gta5HtDS1EPSLPV9RyCqeHr+SoFyYXtcP8ZZkyAYbKF19wRuXCPTCstDrw197k3svLBislsEfUTvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wbWw9d7iR+ftwbOCMRuLFJkZK0tYoUd16eGpowT2kEU=; b=KvOHcSumx1MENiiyk3Qu4zULjtY1H7wtapYrEhLkYPGuJHQ+TFpGePHA574Fxgwd0VsMFCbJTr4SaNMx5cpybI0bmgY1y27kMwT8f9ez6HIbe2crKEnVctxGI+v25ro95CaqB0JZgMWd/58yc5jx34azj8rioHsJ8kwNy7rei1L9oYP01FBkOvPTcv1GdhWFqRpvAiHHI9I7zKY9NoPIfkpMVzs6rvLLE4/rmHpCZ0T7pOVuRnLE3dXeKzLJmIXfek4JH9NjGgB5x/sMixzVpDk7bxk6NKTUWKdnLuXIFSMnHWRyGJ0FBGkpU40rewVxUSXVMgV/w0edb9y3LJXPTQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0050.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.37; Sat, 7 Oct 2023 00:39:27 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Sat, 7 Oct 2023 00:39:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Oct 2023 02:40:28 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [gwwkODZm9Q42zrgGtb460BLOWdcKaDXU] X-ClientProxiedBy: ZR0P278CA0154.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::9) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20231007004031.2024778-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0050:EE_ X-MS-Office365-Filtering-Correlation-Id: 50026545-adf1-49de-c217-08dbc6cddca7 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4fcjnxa0hU/tjV8AK7DshYrTSZYLZkk8X+/EUA25fwu0UBuTkTfUOwR24k4yYTEID6cj7ogQlm6r1njchDw9CqU6laCHU/NpB8DqLYGoe2SQtElEVkLihG3zDkysjpN/zVBYyRRD6KkA+VQeCLaabF9cLQg3KZCsUAJZbmeVvpFWK3Gp/wfWF4FhJcmlMkHtIX7s3vU8AhgkTuMBmD2hxpzBLXvNRzpEumJaLu6sAgND1uTvD4HPtaRtRrawbjXfVtLDoqcXdD7rX2mamFMwpSiR0PYsed7JUcNba61cPbxgO3ssNDamcptPcyVuB86Pgn2HwHbo3gFPK3iCwnHWvebuHhxr1yuK5lqTOOvZEtPBYVy9mMfie7tgNnqnFkiJW37at6wTboM0v9A7XhoD9WbeN21QTXiILGDIqsBkF9AGVEIj8ZIR+D8gd8cTvyyacPWeUXjHPi8eqW+G9GcV1ZGCj/PpX0/3aMSDKdp2xgpiTjBf9qUc0vL/831gU034PpZ6oVNoEDp6noc6DW5Mv8YSAC3OStwwQ8kugvhFGCYU7u7KQ6OCAcBOwNeROml41EPDratgozzvBsVIYSf2lyyZXwr04Z9SoW8BAbAXIrLErVGXyLQypvAJnBhpj83R X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yfIkx0HPZGVW6F+EPk5HtA4oaQwY56hCfuRLrjqmP20dh0f1pilrNYoSFUlJVUHhPUC+fzoCVVRaOEgBOCYBCAu3JUUxvZdYG1T36pbPVYMSy9Pv/szrMmr00zdg7YTA9FidJne369XaVRBaYzxsRO29aMh7WlJsDZrvChpKCqwblUChIjirphatZ5zN8NvHuGiWM93scarMpT53CMgB7kMq0sP7lU02E7VtQaXtbqfaGkcN+wGM5fnnHdjvhTnah6V8GT6pKVFluiPRT6eojUhoMgHBsqVCl+R6O7jbNFNHJJ0XQ0LVh1hDpLL0npqgLsDCZSHtM3g+fltO65CRIo1mjpPv21KVGHqIrjPMBiG0v++Yapyw5t2uE5yCZmqQ5hkP7R70RDWx9DEjfpq5+dC8QU6hzvpDNLeLqfDI1k0juEKE4ZRHZuebXdPFbuET3VGK42gRiEtCqAveYboP+age7+7KEMrGdG5UBYlWBxAZoDMnA/Hc9FZIFRnNcRy0DTcg0kH9c1sIs5uPqxxM8lUrFTxnKVSElXqyeXaDWvkPRIOIvhFhjaOfU4ONQU5HNrIRdvwh5gWoNgPPXDMoizu6Zy5lgjhtBuxfmbo53TFB44oEKdO36zYtHr9AxLzP05ihM3HAjdzbATnzpX5zXTn6Kx7HXGivwq9X7ZusC5+8al6wxnq0ry6teDP085d2UVVTZh6JA0v2oIaVxh5rlhm+PsyfSTFUDEsSvOrhbMfExHwmVRY3kO4KhuEkKdGHZYH36pXdItxC4decOH1Yb8XlzdkuO1nUrdRi5nGMg0g/DPTFWPhu+Cfq+vMLIXOW9A9KRyMnGI0Yv2OC9UJLRrBdMnuNqOU17Mevsk8RS7jAOUesOR86XdArLQYCeAnKhJ+XODYDchKzFTSKTPFFfLMBNShQXxgy3FLmKPHkkcZwSOaselTJtP0K+gRrQ14tUiNn4ef8axojeYfqW5EAcX8XHDcZ533wolq0ydrvKzI9peZxFw5UvLgE3McjcLz0Dk8+zJHJ/WyRqXLuI1aYHm+Kh8767Lu1YTeHovwjsCBftXJXOkQjjB3AKkPj/f6lzZkQ35F+I1sR4833+tmoALll8cx6/eH63NwpIjPJZWkoXQuqoPcdqfEPlgHh5Y/SiIhTR0M6N8KZpoOcUpOWIeTgqnswe1gMgRg+DudB5N9ukTK8F4c6iuX33Dp7vHOKr4QJG0BIDQWu8EuAETmyD0e85PafnnnAcRLuw4IMl4rsd1DeUqSf/sZEPOHxXJeB X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50026545-adf1-49de-c217-08dbc6cddca7 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2023 00:39:27.8249 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P250MB0050 Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/h261dec: Remove pointless goto X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3ELIJWbYd4ZI There is no need to parse the header twice; doing so does nothing. Signed-off-by: Andreas Rheinhardt --- libavcodec/h261dec.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index 91d555a70e..272bbbea34 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -605,7 +605,6 @@ static int h261_decode_frame(AVCodecContext *avctx, AVFrame *pict, h->gob_start_code_skipped = 0; -retry: init_get_bits(&s->gb, buf, buf_size * 8); ret = h261_decode_picture_header(h); @@ -627,8 +626,6 @@ retry: ret = ff_set_dimensions(avctx, s->width, s->height); if (ret < 0) return ret; - - goto retry; } if ((avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type == AV_PICTURE_TYPE_B) ||