From patchwork Sat Oct 7 00:40:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44191 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e24:b0:15d:8365:d4b8 with SMTP id gk36csp161133pzb; Fri, 6 Oct 2023 17:39:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGF/Fc4NrcHFJaRDr7DclzVFR+JggbgzxfzvAG0Hgj+YiFXBcLEEBc/j7EjKvu362Sd7FRo X-Received: by 2002:a17:907:1dd2:b0:9ae:406c:3425 with SMTP id og18-20020a1709071dd200b009ae406c3425mr8819431ejc.0.1696639183124; Fri, 06 Oct 2023 17:39:43 -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 r25-20020a1709067fd900b009b97fc4469asi2070578ejs.302.2023.10.06.17.39.42; Fri, 06 Oct 2023 17:39:43 -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=ctIH5ElR; 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 DD81168CA44; Sat, 7 Oct 2023 03:39:36 +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 5E72B68CABB for ; Sat, 7 Oct 2023 03:39:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nZRtDXEsdCEVy4KRdl/uYWPaf26knExIOafZmQsZXXXL/k9i1IbvyT7Y30STTWNFH3xzqRjwL15TqtYoMgwEdhZA9xcA9q7vYG7VbKsMFwGIbGABn3WWI3abLv2rv0aQpnKV4bj/n7cP1RmBtmJXHwCqZh+B1TvX9yPIG1WsgQXQzzBeH1NRLPRiKcIXs5Y9Gn/y2/OhZ/tmEWm8P6gr/xubvs3MvR+yrfMa4+yz/d8tOC+nQ1y27WAbpZpiBzr/lqni5Q08YSeOGQdRri8kkqDxwYCYOoPASfPHkXmtEQYhEopvSe+sy3mC+xZH1Xk/LFqtjjcIkbjA6YQTzG8C/w== 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=mbBfBJN8pCgxDC7PFoC7ApfvOkHntX88bGnYQbhUUGU=; b=CC7OCJaQWfJb1gc5srRU1fo1QRH7tB8F6o7KNoTT9p7oJDMhI3+37ShNlZ/ku9oANn4VgQJBLtNNZOGFW3sMvFkht2OOueiePIGoXzEhTmWMKabf4fQ8Cu7TYXaIA2mIXXXtYPrPOF3N67mxw+HoENA2jsaaZme9vfaEsPFRb4A3ZOOMI0aTDq0Z9zPbFYUEKEZzOBanH1pht3nX+0Czh76dNNtM/B+q/zfJH+wpk5n8t6qE3u6loAen7RnWeVaaNxZPR9nlWjWklUgt4bf6gY1XRJhHBeMRD5+ypHrf4Rl9ZhaP1EACDI+odGR8Vav99W9CXic+t/GOzoA4Ijoz+g== 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=mbBfBJN8pCgxDC7PFoC7ApfvOkHntX88bGnYQbhUUGU=; b=ctIH5ElRawsRVuDrGKCr3og3iNWrf2sQPDXs4CMCGuhLFY0UZYKnCRbdHP5e75gdW0A69j6dX13sb+1Lg+KuYFtRWoXOBjvO1/mYo/820F2HNfiWdRNgZD+bRhwewueh17tDRff86SVXZFHm1+ihpdEsvMAftBb+n2dDCD/Hg1V11HtVoCMTyuRl5dzf/ncu6k0PQ+E39HksB+upTqAR+yL0XwqZuKAlDnM8wixucCkixxsxPfc27Mp7fM1Y8qXjF6/rWThyWjATclczabeOqB02XTJMcPVMMJoaQoeyFEy3VBNrRVcyArZGCuIHDuulvsXV/+k0n4GZtwaqEcFrjQ== 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:25 +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:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Oct 2023 02:40:27 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ZfT5oP1Lf6f7RpBtlNm03DmyhMBSEWzi] 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-2-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: 35b67bd0-e060-484e-e3c9-08dbc6cddb52 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S6KqWUkgrUCP3g8bmDAjyzqs+D+mkxWS2jV38XXo2Wz8kVXaKbUk7kVomRmX5gvTLtDIn1uCSD7YA7NP9n6sc8kDtEqtnyhuVauFIIo4KlPrkxNUCXM/LmDjm8VvgW1ZIdRGdRyuDDlxISZeoMWrm1QV6LcTJrjJN+gXxxovt92AXX4aWzg6Uz5Uc8A8LyrApTLLowwXtLdvTd9hHkkalLL0imRzP5/tVlxExy9Ao4M1oH2Q6rPK4qyIJGmjs+SUeXj1+aKahQt7QitLptip+KH16+LC05rzynDc9AS7SR2QN1/IMPsXT4PeC+k9ldoHbFGXqAJ79AYbELtTkYAgQ7trwX3IvYQ+fvqtSbKiTWbeyXZvPKxpBa5fIQvUa4gRMsMdlBEUXEmR1OaNToqu93RLrt4+fTJXI3VsNcmnybctqJRMyVINz8FNOfbDTs4T6T77r5ThSF0uOmNcP22NF5uDYCsioD/JcRzejOaCLVzRTak3hddznkTFTOOthjW+voxJ9pgzB29WTbuoNqMmUNthwSNp6E/qzXiyWQUMiXw61br1edxbBx51AeLs9xxE2pmY7o4EnH2jFtPGAjVHc/GFilziMvxZMBG941nnH3zProhiThwKS4HZCa8dsuVh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: r9WHpBJEcIO7jJRqmhtmwxFbtDcWTkw26MUzS4gnh6YYo9elSK6lpDdkx0pMFvrPM6HFrvIZiaddDU05/AnDeZ7YIV4YLSTQVgDItXktTYI4tbzHsTMkNZ+iR7dSzK3Cii0xcFcMw5o16S0Z1MeWNWvXjTFoFJA7UTIV/fuIVhvgmv4wIBAGyJBfuGr7JpgZdM5P98rURoQj4znbIwZqgKQ+YyvZxo6M4lTq0MtBZWu0lrzuCK7lwUQYCHGg2uei+bIuO7Guq7XFWXQxSxXKkI7nyzJOxuVscvcKyUc40IdvPn6VC9UcUuD26mDQFaaPy/JKpc1Cv0grbe6jsRJOmrfzWHOdfWWuPX2mK1ngJwiKdVwv6rO1T5mqMBB0Dnccd2TGtfCbpw1mvcge0CV0I72l56hgjXgsQM3UucwzKABJq+TaZCJ2ZN1n+0D3Qc9U5n/0msIb4EyqeigLAFt7h6p3asNqML595WQ5E5BPUjs6NKtcgzIqp7rdEiqNSq43Ubhet6Ixtzmg01n7CqICxCkGwZEavNitPf1ggO2oyGjolwAmDB0FZCaRrYTkzBFod108sT/AHf3gIV0QxWtc8LEJTeGdvvAumE/6H768gT3ni0Pmbp2OA01y6NCLRp3yBGjjAI6rCI8qZq9/AdX8E4rXp6iOscaOttC9pTzn35P/P7GoFs+DSACAQi8oXJSbL9u00bCm12yXFHvbbZJhYSWDQJe24GtEqIX/xnyw2yoTgX//035HyLnBQlx+aLaLvhL1GwlC54feTD3dPlnOo13imM37sVslPkUC2dWdD5ge4BUUVSDuZDOzIgIZ5ibMbaDXX8ri6PY2P8gm8+RED6q1G4hf/Gc6DxOO4ZbwVeCiyT7IJsp3dVvFEsek9S9pMDupJk2FjCE3BG69lJCq3MEu6dX8BT/KOjtLHp5t5E2iA7nkiVVl2ztKVDjRuBGE1tDiHIblh6kAdwSZPlwUXzB8HkmUIwjOP9jLdUmYKZa+1dIw+yfg7MSmrgUfr9AuZLA8cDy8W2XvRMwArvz4F8eQVwFO0euad1/Gbno4K1FnBToIjYfQL7rJiGxjHzc3YpZzxuHwu7TP1ZOIHlBiN0GRQOg/El+/n57NICyZpWc60WbXczRJO/kt39gES/V4nqR5oadSDyGWdOosuZsWG170wEVxupQ7nfEW06u/4lwS2HSuApYPH85Q8BT4nzoasJgsjY/B7FIXQYgmxHEjkmPaZOBpVPPMymVcPsWFomKRVvOuuzEmJZXkRCay3PIa X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35b67bd0-e060-484e-e3c9-08dbc6cddb52 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:25.6275 (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 3/7] avcodec/h261dec: Don't set write-only picture_number 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: mJaf2JrUa0VN Signed-off-by: Andreas Rheinhardt --- libavcodec/h261dec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index a4e0bf9cf2..91d555a70e 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -512,10 +512,7 @@ static int h261_decode_picture_header(H261DecContext *h) } /* temporal reference */ - i = get_bits(&s->gb, 5); /* picture timestamp */ - if (i < (s->picture_number & 31)) - i += 32; - s->picture_number = (s->picture_number & ~31) + i; + skip_bits(&s->gb, 5); /* picture timestamp */ s->avctx->framerate = (AVRational) { 30000, 1001 };