From patchwork Tue Jan 25 17:41:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33849 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp833057iov; Tue, 25 Jan 2022 09:43:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJw5SvBKXTThUc7TYiUFHrnBvUxmejnn5TLVFcmP6Lma0RPKHO/qmm1nBDTEPZVVh9S+FZ9Q X-Received: by 2002:a17:907:8a26:: with SMTP id sc38mr9429107ejc.80.1643132613135; Tue, 25 Jan 2022 09:43:33 -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 dd19si11744404ejc.610.2022.01.25.09.43.32; Tue, 25 Jan 2022 09:43:33 -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=jvtvyc5R; 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 C3BF268B109; Tue, 25 Jan 2022 19:42:25 +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 A5E7768B08E for ; Tue, 25 Jan 2022 19:42:20 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hNhn/RbhP4iO4D/EpKvfUs/jP6h7JpbPd+5mq1P4AY8Vv1DjPb5BfG4ksKZ9nifBQT3tYH8R8/F0z2Vq6l6YhSQlfCNTQ0r6VCsvGG7JpaXUgstK3ygkNTpWZY7jj6GTD4JgkUfQhmjLTqx+yLQeGBiEwiKTazNfjTPoTEcuuvSTqa75J9UcxkwmG0BHV7YPqFtC4yRPnmoefoPi5zUstKfKb5RqFve1sEK1SuUfFwnadaT+NUN3fjzHWCc7wN5M2rKphuwTop24qdEPvtOZhx8xs2mtdDkm+tB5QzRz5V/hMlezc2V8LGxmmRRsV0PFxCtY3k0DRQ/5LpY6igAXtg== 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=WK1aU5S7DiIpMpQkIvt3T1Ww9YbcWPSRPxSTv0AN2mY=; b=XAsiO29qacRNKf3f9PLMXGvhNNuHzPhTpyAIRwoJFgu/t+C0bmo9XWJQGozMwYOQAnYixs1D/sN77DZ9DCm4/4adMJ5q273EBSRmFptTmso3wR/YP3/JSWZVpZaDF2QvgmsgTmdS0MgQ3BsSE9oUNJqpBhc1gJ5qSrFY1HmVHqMBDx/Rzsl6iU3wY2lLIScn/Jdcl1wgv5ex3l7SJa7YNsI5d6i0hmHxsczQQKPNu8JeAz0ZUR10HTFR6gbwNZQ3gSeVPYH5qDLSAlpkzT0Ur4iVv4HR9nTQsyrNONyzV5UHDMGXYYQGHX8mWEIs2rawpunP8TIGhH3jXh1wdwv0iA== 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=WK1aU5S7DiIpMpQkIvt3T1Ww9YbcWPSRPxSTv0AN2mY=; b=jvtvyc5RQQ6CHEYG24rwGTfb/eryNdnu4xaoo4DVspDUKGHW/tDpjWpeakmCLnm/xCU1vWy/Xgw53lQOTKZ7PHK817EctOBwEKzO8DWDNNf5dhF+HfoziyilMSO2X3BalfGPz72+PqckxM0q3BPqauMtevjQmz0680QmJU8pzvdVaferw3rbSHrr4k89f4ALUUkweQ4szSiGb4C5Rrf8TpuCMShQZqIVk7xjWQDjuqrLJ1hHZwulQnX58qjhEHU5WXqeOrlWlb6rLxpEAyKQ2pGZquFgsXInlVz9DMGwZXcil6VNpN8NhxaivsrUTurLBH2hHAc+3urELlEcGLE+VA== 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:15 +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:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Jan 2022 18:41:37 +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: [L5vkf7j4RQsHGcsHEti7LAAAjWxBiyhm] 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-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bfeddfa4-9df3-459b-2caf-08d9e02a0655 X-MS-TrafficTypeDiagnostic: DB7PR03MB3500:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /2a0FN7qfGuoSFtgXAKcTUuzjBmrE+Th0F9BBKAB85mQpB4GTghRPrR/YieBrhTOTemGsuw6//mQ+UtlWFw2mH/CWbWWSW/qIlMw3gPVNJstYxGhd7MFRP/R9iuj0jzT0SciLjSh42hxzcic5mtcOm3aC0TpYe1ZzWQgdV7TQQbDEcr0UC0KVUMMs1YnQvY/3WaZcpy4SnTS+etz2RHg68gkA+pho4+TD3siL9nn7DG070IN9P01CZLjGLu19IGh6goovonC9ehOHT9RQCRyxKw2SV44SVG0omBSLod8bUVBFMYobjCQyU9dGsMnurv4BEbu1D2/r6vz8Fsigz+W81UwUtUjIG9wU6USJ8seO5NES8UL8gQJo62tENsOD3FFzVXYaCI7ogCxY4ldkGKsg7ifR9fM1ZlVM0fa0y5fGL+dK9oqIwprPj/9BQ/Z6V6U9xvCdiVgxj3fIFxk48UOF9UX8EYapDzOs5UAAOhtuzrPW8K5xqxyLwtC+fFCIcaxe0X3bprLmPWUpVasR/7GM3Qu0u7QSExENC76tyYyuoZrQ1dECfSfq6IKMmyqE4Dl X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bX5cIUTsMHWrlGgOpyjUEBKRl+y/CburhOpguZTAwCow4209x2rOUlcuRybjtkBpqD/TKC8ArJ9vfLSwtyxGidUofg805jkhzk8VIHjZ/Rjs8DoMMsyf7MwV5QvqYZCjoV6XEXVYGjRy0k4lT9pxSARoaTJfNZ5Zhrnjqx3COY9Torqul4zr/sqRjyUwgLDGNe5sfMT7t+zwn9eweoOkHqOMbB8gta16Z3ZHH+Gv9sDk00OH56zbIQfYKIyUbb5TGiSo8wGG5hnWrMC4fBcuGwaGj8rOn+Hjgmo29dlXdXgzo+B8HLmw5/SAkCfwD7xZzPBCo0wsBbG5wQqVEtiaB9oywHfmEdYWG2zKGGqZkSHAmn+6gFT/2AWGIs7XIiQbRyoVMzC0pYJ7RI+VdCczjFbkBz4TDLPoxYkt+QNjbope/I5bL2urY6F468piGe9ObAaNR/260O+bl8gAeCDWrUYyeN1YilW8LKC3iZ8lvIKoybVg8Mez2gxTYcE4fGakUxVuiYNZPjtPVkXQO2nm1NJ4XPnnm0b0I4P7cycxiUuH8Kyjk/PTrb/Ca+Adi14dwDGpXPESZjDSe+Zee0zwr7/I34fooiyFuKFA+7arHspqB9Whq+249SXjZ7X7Fi8KJ/JujkEpiOOa2vZSDE2Nmh6tifcwX5ePWb2UVCO9tKKJM9oeZdqS/rCK+Bmn8MlYHdAZrAeVgjU/UkWxjkEF/e94rB9qzvJwC/+Zb58xc6F/9YRUFmfjjav4EBRP0n0uK0Gq9UxDQpVWcdtcNxuhF9MAEtGk1l2dzG8jGMmOlgBtiJFIpRyK39V6LPimruUp00RfYtTJHvXYchsEaE9g8PwDd9ZvZGBh8AwwL1x5EDo37YlECA5Eu5E9OMfe9x0DjHwWTCPh2jNGSAgqesDQ4nBPk1eE5toyWmPzJIgKxivhvlKe3eGqOs2bzkEhN3H2oTyym2JaPE2YLgmeZ3wXKw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bfeddfa4-9df3-459b-2caf-08d9e02a0655 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:15.0222 (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 10/21] avcodec/mpeg4videoenc: 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: jXe5gWB7iDDU 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 b3e697daf7..27e16c3b72 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -961,7 +961,7 @@ static void mpeg4_encode_vol_header(MpegEncContext *s, int vo_number, int vol_number) { - int vo_ver_id, vo_type; + int vo_ver_id, vo_type, aspect_ratio_info; if (s->max_b_frames || s->quarter_sample) { vo_ver_id = 5; @@ -986,10 +986,10 @@ static void mpeg4_encode_vol_header(MpegEncContext *s, put_bits(&s->pb, 3, 1); /* is obj layer priority */ } - s->aspect_ratio_info = ff_h263_aspect_to_info(s->avctx->sample_aspect_ratio); + aspect_ratio_info = ff_h263_aspect_to_info(s->avctx->sample_aspect_ratio); - put_bits(&s->pb, 4, s->aspect_ratio_info); /* aspect ratio info */ - if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) { + put_bits(&s->pb, 4, aspect_ratio_info); /* aspect ratio info */ + if (aspect_ratio_info == FF_ASPECT_EXTENDED) { av_reduce(&s->avctx->sample_aspect_ratio.num, &s->avctx->sample_aspect_ratio.den, s->avctx->sample_aspect_ratio.num, s->avctx->sample_aspect_ratio.den, 255); put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.num);