From patchwork Tue Jan 25 17:41:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33842 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp832157iov; Tue, 25 Jan 2022 09:42:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJxQXwWFRrJ5KFWHI/tlCMO8PRurA4q7VRR9PdXKGjz8wIWR8wh1EWB9eeCgQIWG3OupQS5E X-Received: by 2002:a50:fe90:: with SMTP id d16mr21298920edt.361.1643132538239; Tue, 25 Jan 2022 09:42:18 -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 hr42si4892777ejc.818.2022.01.25.09.42.17; Tue, 25 Jan 2022 09:42:18 -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=PjknP0f0; 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 9D7F268B00D; Tue, 25 Jan 2022 19:42:05 +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 12CC868AF97 for ; Tue, 25 Jan 2022 19:41:59 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LnWMkkE/iiZrVye7GkZQNU/1oAXKaW/0dt7Jr8UuCvIfPxr3EuIWVEyvl3tI8gp69YSc98sGUWuGP1OFV4qAJwKw6hGRauYkGiDSX3wje44uE7nKLKk/0HIC6NgDADe4KCLwkGWmdukJ9NRyI1Y5eaNBLjIzGFQj3YdqsrEFhyXohxbn9M/LezWcJJXozjerzTuG1CC5FqXmBso3e9IUFFjq+CaB9vZix94KTp1Ajg1Z4bvJgwZH70ThbNXs72DVprz32hzorZySskUoN/Fsg67OmyZZaJEq46OuHHF5ZvHP0vEkHyd4QYfWBH4F96dJPGo9joIl/wx9NSAFN3n2Mg== 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=fDBsx0+aJVpbMs/YWmBJg8FKB+fXsb1Jwx6knv0e2jM=; b=f1ANAijXocTI7y/xV6nwiPh/HdAKS8uw3l3UGMNTupGeNBeVDunn+xsKANjVWaZhexatCBvLgptXW2uF1FfGGLZTnUbypUpwZmxKK0YIcCJ+joIQZKVfhnVGLEXh6FXh5o+cSCI/LfA3RPEPVgBkeX2PvbWYQveCJv3KxzcASZPkWByU9ChPAZ1LS6xNquHTeYiY97rVl75ahxV7dLoGoSF+oTJ/4wc0fmkrUYNPk1ebJ/mCW2dt6G6v4uf5EB5wZ7r8DnxbuY3M2NEf6tlxwfeKewC10hMHKJWDK4p6l0E4BOfacage4aGqZT8AisgB2GFmb4t4X3212n6FUj7SiQ== 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=fDBsx0+aJVpbMs/YWmBJg8FKB+fXsb1Jwx6knv0e2jM=; b=PjknP0f01ioFEUJYVzHbPavFgTJwZ21O5lPS8druIf79kUuhQYpgtw3pq9QiQD90SmNjihNTylglNIcWV2RyP4SGGkn9sTxq5n+VPpJDV0Ge7ogo1TWvkvgupEtkYZm/q/dY94WkCP+qZGFwfP9PL1fug2WKyi2fraQfdHItpMeWeV82a+dqrOfoLlMqJb3PsGmfIeTcyxAcTJftW1s4yxxoYSW6ctfVLce/rdyWX2R+hdlXEQ1n05uxhJskzSMy+suSfwBVebWEQkDAFmMCS4NHHb/+nN0z5FeStKD06bbwd4J6dw7EgZ9yguWAJfcb0t0kUpENKiyb0XijnOQLuw== 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:41:57 +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:41:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Jan 2022 18:41:30 +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: [N7zd4MWb92nvhX5u2JE16nl3mczQDTQj] 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-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bac04a0b-ee36-4b7f-0534-08d9e029fba3 X-MS-TrafficTypeDiagnostic: DB7PR03MB3500:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KiEF0llHyP49c5VXGAnWMdJBYRT6pNq6U6qFoZIzEicQjZpqt8FlDSpOqMSAmCOf1kGeBbXVsPbqDSGIKMk7ZHMyoxbO9hpxUAwa353riKPiEovyODEn3vL/9Vw/29OFshkmslbuSrA1445vefRYW0qROHdaU/tlFz3GumsnFDK7kWM3PqokSlRN5ZfGccjlhfDTSDNi8EynEMpP3m8SKy5CswXmMk3dZ2v1ulZ9Gfy7huBp/I74HUwCvS9khZf5CFzC8UDQj6uhNOZ4XFH0+H1QkC3+BPsf9MVEp8oaC5bC4+tJtZciz6FbOauK4KUBFqfTucKbb2dA7cA91uWvTcZjVLCJWkgB03TPz7mxWpB58wRmJyHdApm4T5k6GQCuKKlmZzNETLp5p6MS4hF4++5Gz3TmB7NB8CFMcTx1Xoua5ZxYQKdkZeTXr0xShy3QP65AeTzQU0YPRLPeSr5JfioTpxP2zNX6oOioHMJwpuvbsNagc1K4y4fJTCROkf+93Jh9pS6Sv2nU7QyZ05v2Q8KXRkg6tE6cC9nkac6J8L1r3QC868OeJgfnAzk6uCCi X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Y1mtJdgIFtwsWfS413o0LvsQrOkIxNxbS/lNGEDthhwlMs4hjZ9bTuLnC6qe4TMkiMFF7wreEvnt1na+UV9Hj9fY9T4cFAXZXbXoFFoax5obeoYBlCxQ9M2HVo9+7dqqvwieiuHcL/TPYpMmG5IT7yswY+tl8DrI/Whu6j4XmQQn/LLdATfjqhrzPUr9o41Da8J9LNeUZSNTBzxAr68ta1acV4l0dbbMSl8lsRSL629EHGWgd5sckjt6Y4DhzFFd26XPlmbtrP8ynqAsb6GLp1gKLfl73aecO2Qx6wKkXPF8pyAisBh1PuEECX4zpDg1RmoeVWWBAVoHwXma9ktG1FOyNbvr9udEMh5GzQ8W20c9arM5PQx0bd1XAPUzTTTcZFpnsKsvFcVcn45UaB6vVTkK185oZ4kX3WXm39Iaj6ZdXHEP5S1VkjttyhViVfBfnHQ8lZGWphaTB1Fw4qNYd9ekyBaa4DZ8smdk6DhZtczC71s83NC4v4lS+2u8mzaJWAUHhqwiqswsE8GL/1GuYMW64EzwRgkzwIJ0+GFWYKD6thnHohudnRQlVLm3ceVk+JP2DA7Jp5vyI3q652I8b8+uvAeuZaykg8ty6bIjZ8hy6HMqxpyJ+YGxfhmVMw0o51nn9bI510O/ZL1tjM7NxSS1IcZRqqynzPDrZPtvqTgULcOiTUbkgCgsWxYo7YMT/fa5+QtDOrp26yDMjo9NLmGEeY9IH/4k5TkYNoPeO5T+AnX2/r4gNwGYQiziEQPJPNTyxUV3ThlW+740TrutlnuqJ+Ef3/+LDexON7u9jxseW7aQpp8PeWz3PnQheW7w7p+dePbwl6lgHiHibRFYXAh+eVP2krQnBAs4bw7u3vvoXi47c17q0KE2MoiFoNHCwVWrHI4H9mGba1aQZ4zGs1vfbdklCt1kmrHgUum9CjpEDks6yav8becC/U0F5BMXQzE4QL//CljVXvnAL6zWGA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bac04a0b-ee36-4b7f-0534-08d9e029fba3 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:41:57.0931 (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 03/21] avcodec/mpeg4videoenc: Use stack variable for vo_type 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: w5RY78TnhS97 Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videoenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 8871d83281..b3e697daf7 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -961,14 +961,14 @@ static void mpeg4_encode_vol_header(MpegEncContext *s, int vo_number, int vol_number) { - int vo_ver_id; + int vo_ver_id, vo_type; if (s->max_b_frames || s->quarter_sample) { vo_ver_id = 5; - s->vo_type = ADV_SIMPLE_VO_TYPE; + vo_type = ADV_SIMPLE_VO_TYPE; } else { vo_ver_id = 1; - s->vo_type = SIMPLE_VO_TYPE; + vo_type = SIMPLE_VO_TYPE; } put_bits(&s->pb, 16, 0); @@ -977,7 +977,7 @@ static void mpeg4_encode_vol_header(MpegEncContext *s, put_bits(&s->pb, 16, 0x120 + vol_number); /* video obj layer */ put_bits(&s->pb, 1, 0); /* random access vol */ - put_bits(&s->pb, 8, s->vo_type); /* video obj type indication */ + put_bits(&s->pb, 8, vo_type); /* video obj type indication */ if (s->workaround_bugs & FF_BUG_MS) { put_bits(&s->pb, 1, 0); /* is obj layer id= no */ } else {