From patchwork Tue Jan 25 17:41:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33846 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp832644iov; Tue, 25 Jan 2022 09:43:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzPyyOoFuGk5ecRA4qKhQ5ggINuDAUqhHINDuwLcBS2wxSELutxS4UfyyJcrol8XRfwZ/jQ X-Received: by 2002:a17:906:58c6:: with SMTP id e6mr7931130ejs.123.1643132580771; Tue, 25 Jan 2022 09:43:00 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dt14si4328440ejc.461.2022.01.25.09.43.00; Tue, 25 Jan 2022 09:43:00 -0800 (PST) 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=TB47uTt2; 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 CD6C868B065; Tue, 25 Jan 2022 19:42:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068072.outbound.protection.outlook.com [40.92.68.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EEF2468B082 for ; Tue, 25 Jan 2022 19:42:19 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FtJpSNhz9D56aRqNT06IfHLP+KLCuk9L+/AaN8Al+o9TG1pAN59yF29mANLztRmFSQDs0u04BJK218gUQNDJtpIeuaDr2j9kHvRgh9OeYK0BS4rFbBWMEJPyvjgDFX8FPUPwWmaGzGRB84neoJ30Nn/YrZ9BxCEodjL8mDA6NnhLHBs7imLKVWtuz37J/3FmCLxh6ZdjXt6MMo5GoMLxILbsm4z6XvDeRo2ojEeq3DAbiRUwiUYoTZISOuFYTh8V6kaE3EHq7tw7pmIHboZRiGv6OspPdRl3m9iOX67cu3r9V/expJvyq6/FqSW7iRlmWneZ28aT2Nn0MHxecF5puA== 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=b+hnLi1Il13hU29wmY2oE6fcSg1gYWU+x+e3SboO5ak=; b=mJJ0eLx7g++SaPBC9x5DWEILqBXCHCT41qq1qqRRi/U2x1hySQ7uHjaizxqD3bpnbUutf/VGqlUeKKhWqWQaFg4stdDeEprh9+S9NDZOY5i4MpENY4gnXHcQvyGX0Tp5C2VsnJvQiugYSgziB+ex9b7L+aTejKY/ql4AkFlGK7S9TmNNspONcjflO29/tKPZIgzUKg0M0M1remSN4UPSJCwfxs/joi7dvi+99vFItP3f7Bzorg0l5aaG2iNaMLJ6x8mwUjzEUsSwZBn+fcusSIrFpdT3YIhR5NqhPABAfJ89oPsLN9q73aCm/fXNJuJ/k/03aCTTzPs8TdsYXXM3og== 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=b+hnLi1Il13hU29wmY2oE6fcSg1gYWU+x+e3SboO5ak=; b=TB47uTt2sga9tOxNMLar7pLVO4Dnpa0eI0wzBonPQSkw28qjIssnXsVPru7rWHTLxP/4lY0X1LZEP2v69DuKua4h7IhGCrMMt0BERvvqxovzYA4FMxL2eh+4ZjM1q8gUowXJpGwJ5uU6Uu/ruoKOW+lJs74rJ5m9tR6wvqnhVfHpDwPHLo31bc2xrGAyQnFu99JtaPxoK7XtHx5u9lNeErNFD3eEPtyi9xx31opwHsb35UnEamvU/sHZGbSf4//Cy4rrUhdL58YoNye0jy0GkjMnCY1FwGj0+OR4gy97pdnt+WEzf442oPOHvZAO/zNfUcnwEZfQ8WZaVeG1fC0XEA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB7PR03MB3500.eurprd03.prod.outlook.com (2603:10a6:5:8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.12; Tue, 25 Jan 2022 17:42:07 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4930.015; Tue, 25 Jan 2022 17:42:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Jan 2022 18:41:34 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220125174148.994967-1-andreas.rheinhardt@outlook.com> References: <20220125174148.994967-1-andreas.rheinhardt@outlook.com> X-TMN: [C+BoGDWsZNQPtlvrlHppXKPFg07LDkHR] X-ClientProxiedBy: AM6P193CA0061.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:8e::38) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220125174148.994967-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6ebc940c-0733-4fda-2ab8-08d9e02a01f4 X-MS-TrafficTypeDiagnostic: DB7PR03MB3500:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Dc8Kpzmz/fK9qiOM4CBa4sq72DaIO7gO+iKWOAkI3m5wMwsjvzgRQ8C1WcuWOenL8eqh9Gca/V9ouIwdRJniRtsO/buCv/IsUnjPcjNCydFUKeyfVcef6mdhrZ9HblJM1iKoLoKa+hXZpUvPtKK2MgWrnzIXh7bd1vbN7txOKY7bsNhHrbXPEoEaULJS7UCa1h/ByPW7cRGtm2T5b5v2beXb3LVgcvT6lqiobfT5RLW6E7B6NDvQdvtFPhBb1KTyez5LSJK9jLxuDwcYxgMkUhBd/M9Wy2l0b+zqMS5MUn+dJjYaGaCooLhhpb2taFfZFYNaGxj3uOj4bJe7bjp47QX6kYnmJjyQ3flxGEJAVaSMsvPa6mzxPt7YurTkSpv/93PlKCDXRs6Ud4B504rdpvnzS3kjMY9wX9foXxmXxBMjHJC5yiewm/OfDyRnWpj6Bme+0G+v5F/tLdoMyt7nMZ/5l5wX9zUbkJOiR8WQoKU/R4bTl8zYDeUZ5I/d6Dt/Lqrf2vQiJWEFnydJqAfBVtM/iuX+L8UW8FuKV6iCMBGg+Pc+wEdhD+H2XkU0qK+m X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uZLhawJtXpav2/DS6LreDcEEH99RY1T04jl0sNZxyX7JjZFqFFmvL3o1cT+z6nuWQOxwBqQa26RmXUy4ipuT/xflKhLpvP56FvPiDR0H2mjdxxp8+EsTo4XI6GK2KvYWsk6fBPfFbZXe+vrwN0WmEls16ev2jn4EK03XV+ntYqZV7Lin1SkbSUdSUu5bqhD4LIWlNse3SjKjcplVqgkM5SHMYp9jV8kNxyZP4uJTp4t4GR0JMI54TWyi4YRdlwyn8Aw+SqH5SrTi9np/VbZe/2nLZysaPN7IxkO1rr1FlS558QHEfeiqcrntY8zLoHtWxjRYYPoNAqaSZKPDYUvokM2486suwimy0Azucsy+L3wKbHL/tv9vbrxZgfULpPv2dOnmDJONi0SpFWbcmbqN7hy8cl5agbdGt8iAo1CmGaVTACC/LjV37Pb1u9oGr1JuBnLXgZxHajiynNuEtA5zvItg8thkoEWoC/78Quw+GaVn3zk1gRQXoPTnzcu3DZEOINWGO9IMT6acn04CH3QSURCAeBSiMzC6jKZnadYyzaLWhJYGUiKQyNVvPdPykJFa/w4WZ/wKuPlDwfjHEuR6mGIRv5C9U1t56MguDuDI0z4TWvtLFkF9pcHia4LMSbbOYuDglxAA4Kqdg4JfRVYfo7XzK/ZR+L3FJZWn0HZLVxWjA40tRvZaXyKqpPeu7Yy7P522n9GCqSnqSXvvAMEOyXSzXmVJY9RDVv/m72VN0WhgXEzNSkw2d/q1VMxNB+mkO0uzk9H1TFd04XdTDdWcLaHbwFi+N/vENnX7WoD9J8qZAFcSrcAVGiRpgT+xsY4TI0/O96sTTaxXFu4/bTktfLbfh8bwCEupUlP0ypAVYG6oPgfvbAgMs3+ao89kKxfNrA/7eIedHT5Bz1jZUqTEmUZerbRikuAm1sLZJKc9+zpfShW43YdtCGmwFWmztYThPHOIcEj1k2gWhdeNRf88Ew== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ebc940c-0733-4fda-2ab8-08d9e02a01f4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2022 17:42:07.6756 (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: DB7PR03MB3500 Subject: [FFmpeg-devel] [PATCH 07/21] avcodec/mpeg12enc: Use stack variable for aspect_ratio_info 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: AjTHRLjGcCLl Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12enc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index e28aa809d2..a19100a42d 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -273,6 +273,7 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s) if (s->current_picture.f->key_frame) { AVRational framerate = ff_mpeg12_frame_rate_tab[s->frame_rate_index]; + int aspect_ratio_info; /* MPEG-1 header repeated every GOP */ put_header(s, SEQ_START_CODE); @@ -291,11 +292,11 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s) if (error - 2 <= best_aspect_error) { best_aspect_error = error; - s->aspect_ratio_info = i; + aspect_ratio_info = i; } } - put_bits(&s->pb, 4, s->aspect_ratio_info); + put_bits(&s->pb, 4, aspect_ratio_info); put_bits(&s->pb, 4, s->frame_rate_index); if (s->avctx->rc_max_rate) {