From patchwork Tue Jan 25 17:41:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33852 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp833447iov; Tue, 25 Jan 2022 09:44:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJynHbLqKZauvIAuh6RvVuESvjdw1ElMyAkIjsrGeqqfGauQYvYbM/h9YkLT7Tddyrxa2+6y X-Received: by 2002:a05:6402:2d4:: with SMTP id b20mr22187979edx.98.1643132645072; Tue, 25 Jan 2022 09:44:05 -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 z8si5591595edc.157.2022.01.25.09.44.04; Tue, 25 Jan 2022 09:44:05 -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=c1XUrJyJ; 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 EF1D468B162; Tue, 25 Jan 2022 19:42:28 +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 6530A68B0AA for ; Tue, 25 Jan 2022 19:42:21 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UI67bIuitzPvhYWp1sOI8hs3BXYRicnbOZ8xk+Gc+9WQ8bVNeanBr36o01iLCaooohc5FZ/4MRLpTSx8fOEMNFKJykrQPFnY4OdLo813qyMos4E5edY6kSN+tn2A+2BaeZRR0TMK64zuVegoQZsi0Ek5QEdS6GuRg4hpX3KEbqXic4KjQ41EZND2+toiEu9aAd6c9ZJSm96W62f359JZPs+Ppe3kJvAiBL2EOvpuAaUeGa2+Ztjgz0zldlt54vAicu1uJSEcJNO4OztwUEYvRDz6Opx9FXP+LX77Ry6SU+FeaOpfnvj0RgwC/NRchovzobwX/bWO+uytf0Teisp8Mw== 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=+dH3vG0Vd8wYuxf5Lv/30eu3e1YXcKRZ5gp/JvAyfH4=; b=ifB24QjFWbvOJ2dtpE0euyh1aUWzs1OnzjE3xVCeNImwRtRb78qXmGlpy5DNej01thB9/UoRiHCTNfJGteo22Ki0XrTkrKXYYb/3j5HuTr0Azi2uwwIuVPLLJMsiIvudGLnros4DrLmBHf3LaOCCrvsJtODwu9X6SU4JoNWpqdYekJ4qwFtPR19YUoPn/rsQ8YJzWIxkJtVCK6sJtlPG2XNgDq+M2XKNab47dSulMtP/3GoPeG2+QPMLCzX+Po1SCBRtIW01fCQp6CfNJjsasVozlFcTvTE3OM4qdHT74PcV42g581vGy8aeuG6mWYniCrIr+DJOd7V4DpK9tBwEYA== 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=+dH3vG0Vd8wYuxf5Lv/30eu3e1YXcKRZ5gp/JvAyfH4=; b=c1XUrJyJL/vvcM1gHO63X1ZacNhpy9UeZX7QECqceSx2BstZ12zPBuIj4V/pvqMqUS2qiHNO8+xYGsXCZuCcU1eTRx3yPLO0m6h8IqA789BKhq7nuJuD0QPE/LGXzyccXvSBPMFBdo/5AxbClL7tujUMP5ZU49+Uo3z5K+nhzeEHLPhb0ytJiZLE7w+szZiMTcXxgiFBmR1ePXOYzDthdKZ6RuvEIQxVCr1S8nX03fVH3kZczjMWAD+DdzTQf36KY2cp+Hb9YRDrosSxsNQN8Ak8WDWb1S1RSnoLXPxZGycOItx7xPlBI8Sn8GXytH8gpAQDPdlKQBqfAK/Rv5T76Q== 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:19 +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:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Jan 2022 18:41:40 +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: [Hu4vwqO0Mxwxa7dCzjk5fz0ysVI4xQTd] 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-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 80e736e2-1281-492d-6ab2-08d9e02a08f8 X-MS-TrafficTypeDiagnostic: DB7PR03MB3500:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GLXK7L2Z9iWVDY5IRCiv214FW/Y+cKeD4S1+tWxPclZQnjpxeK8/uP6ZcN/uB2iI9cce0hMBtX7mAgtpmdWDQ8WrlicJ2jUjFl/pzhxF+66oLlHb6xl9fYPxIcDUij0if2JfL26eb0mu3v7kKglzq7kSbmLL1y9FCwc2/mgRiew8FDuLhcEENq8DYHg19+gLhp47BUVTuwZQYPyFSSCohMo4G2ZeU7LahqyXLe1YHano64q5TbDQAVCL2K06lOmxAMtEZKOO82ihEleV83VDobkl6tLMhtaSEqsmJdTvGWzQ72dzHaKcfIBhz+FIKcz/TAXKtYuFrJomOKRAaaXgFIx8F/dQZUxQ19hxp8IcWbyPsU9uVkiAooJs3jFYMC6OB4MBSfc1hWgklHIVy4odjjkJiSB5ZM4FguIY2oZZkQGr6U5sYms/GP64wzPnBLBLtqa3cfnuFuaUy65S4yYiPIdTg87mGOO9sbhKA2jBwmpMs/8hNxAiZFptQuQonH8hWQESmAukY0K17Ddsr2dxaPG8Cjf5nm+0wMe3oc8dw4PMsaVTjWbAPKmjy7e0XLsj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pyyADuB6U1mRluFyvNYGvAhncI71a2L9aW0yBBGx7BtFeJ2Jehf9NBZS4E1O4UAt0z/YBVse1K8SO5bIrxO9T3h+ZoQqUyvyrubAFcPY7o6MrmKXsPB6MMIipAinVVgrCFOfTuUi2FTUGEFaVwidtzoZuwa1ZvflvpAsplHt7DlR/QN7OageYYcecsNGVLFS7PRXoB6CvjxEsvCC+wYkw8BmLf5wsb8y/eTTVNHCdup+qjpUF7dVlZdswGLAqrcTv5h6nyRJv7p8hrJgREOTxWtsJN+V05raqxQdHX0rrAwfcOEitLdik+p/mkuD/UoEz18ZiW+Lqdo7+2ErKAv31IMsrNxNq0BxCrbSEjOgZcdk/M4/AsYGx6m7z16DbiU7SuQ+OznKaylLdGHWGxS2gnrLCibCt4WClKiYJw1jrolkkB0l6DOB5ExTEPdQ7OX490ie+L+dUA/sc2t+b6QAFS4VBKBpqQ70OmhZOvbCqci02F8qgmOZH03IkJoYEkdYWrybkwtXQwOjOkRWuDe4siDRtW+VvMPTNxTVVnD+OmT0sXJIdIcgqvlAcBPjsXfEW37Z+ztBCGQehCuPzROlQDovLK9GlUqg/ORgL2zbgIfQ9qy0SBMxqpqUb7qTwHtRJQR+nV+SaDae2yUJys0JUj2Eec+J+LT1GFQOKJxa6bCaIyvFb0VpxRGoG2milvwF3M47FYGlVjDPEXrVlcbBEErEoVFZkZcMPjTlY90GpCskV95krb38QiqlnVx99F+1rptFeYLOCLCX/sJ9Iiwtl8eoPavcg2I7JFaSUnwGX+0bN89VsP2C3Lh6meDxdSw3xF13rO98FVm1Tn2+//Ocm2zQm0gWcggDDfrnR0+yaP7I/f3koWIQenAnoy1z/TwRQ22ciyssFKvgDhyLlxwAEn6hwWN/nkasjs/A2nmKtNNy7yMYMoWfg9l1bvZ4uTrE229Yp4LDMm/jZGiGl7i/dQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80e736e2-1281-492d-6ab2-08d9e02a08f8 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:19.4475 (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 13/21] avcodec/mpeg4videodec: 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: cxvEsxEVyOHW Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 00bf7b6c4a..bdd320b1df 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2215,7 +2215,7 @@ static void extension_and_user_data(MpegEncContext *s, GetBitContext *gb, int id static int decode_studio_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) { MpegEncContext *s = &ctx->m; - int width, height; + int width, height, aspect_ratio_info; int bits_per_raw_sample; int rgb, chroma_format; @@ -2270,12 +2270,12 @@ static int decode_studio_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) s->height = height; } } - s->aspect_ratio_info = get_bits(gb, 4); - if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) { + aspect_ratio_info = get_bits(gb, 4); + if (aspect_ratio_info == FF_ASPECT_EXTENDED) { s->avctx->sample_aspect_ratio.num = get_bits(gb, 8); // par_width s->avctx->sample_aspect_ratio.den = get_bits(gb, 8); // par_height } else { - s->avctx->sample_aspect_ratio = ff_h263_pixel_aspect[s->aspect_ratio_info]; + s->avctx->sample_aspect_ratio = ff_h263_pixel_aspect[aspect_ratio_info]; } skip_bits(gb, 4); /* frame_rate_code */ skip_bits(gb, 15); /* first_half_bit_rate */ @@ -2301,7 +2301,7 @@ static int decode_studio_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) { MpegEncContext *s = &ctx->m; - int width, height, vo_ver_id; + int width, height, vo_ver_id, aspect_ratio_info; /* vol header */ skip_bits(gb, 1); /* random access */ @@ -2329,12 +2329,12 @@ static int decode_vol_header(Mpeg4DecContext *ctx, GetBitContext *gb) } else { vo_ver_id = 1; } - s->aspect_ratio_info = get_bits(gb, 4); - if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) { + aspect_ratio_info = get_bits(gb, 4); + if (aspect_ratio_info == FF_ASPECT_EXTENDED) { s->avctx->sample_aspect_ratio.num = get_bits(gb, 8); // par_width s->avctx->sample_aspect_ratio.den = get_bits(gb, 8); // par_height } else { - s->avctx->sample_aspect_ratio = ff_h263_pixel_aspect[s->aspect_ratio_info]; + s->avctx->sample_aspect_ratio = ff_h263_pixel_aspect[aspect_ratio_info]; } if ((ctx->vol_control_parameters = get_bits1(gb))) { /* vol control parameter */