From patchwork Tue Jan 25 17:41:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33851 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp833318iov; Tue, 25 Jan 2022 09:43:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJyV6Ndj2W6nvq9Oy9udrzlVhAfw9S43laeaVKE98oGt99KVf2ZEgsHCAV8WxgeOvchDyXGQ X-Received: by 2002:a17:907:dac:: with SMTP id go44mr7795838ejc.572.1643132634220; Tue, 25 Jan 2022 09:43:54 -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 e14si7092288ejl.52.2022.01.25.09.43.53; Tue, 25 Jan 2022 09:43:54 -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=Myf4fRn5; 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 13A4068B148; 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 2810868B09D 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=DMF4j4/KsUJqmVg8DbmvyJVoq8TyWq+tiVP22jllJeU0KjM8ZWrhiFGtaE5YeMtHLKrm/zoQb4PVJk/+YgrNgqiiX+Ibf9Ko/vhUL2Cg7HWoQtSH9yy/jMUfyhPRFBKMgCf7Z7Mnv4KWU62SKu/SRq5fIs9EsiZB+dJAh3L/hGFTc9zxWLwrUP/E8xeyAv7Bte3/mbFR5nKinQo2fjFfOD2y2VhtcYnS4lvnODPbSx5sWQ/ziAxBOnrWj6GJrbnJV4oq972kTCC9bdnUwgMzyJlEDRmvGSlcAmqBuupmEsyDqIfbcqgFc64s+XA9Jbb3cIuLd+9eX3TGlJj2pw9rUg== 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=xvjJNLAAJ5/FUlYK0gCZXu7okfiwEQt09j7ml+3nrLg=; b=nmE/1XdPJdJGE4gNSkxmoMojxz/8fJEJY7foBV72q6tmmO22L6N1sjF+XGzVLKBXNZ+WleXqWrQxZxXkvdlRSqhkkaBeb7TUEyn5C5NNTZBRZ4r6SeMXI+8wH93uPEa/tbsIDEI0LOI2hFppQa+D1cQ9lM0u/v8/4Y4DDHjUWSw/Vb9tZknVN1Y05uEq6xlsq56x9+sIxMKW/n9LKVYEl79+6n0O3YQ/xFcDoZpnMuGMi3Tqt0nsVksKbCgT87xA9IYyA1WrOaQZqkpCnO8xDMbS2TI273hA4fCHkmob3Gj6999VQi30OV6Vce/I3j+gCpN9qBVxwlbuv4g0fZ67PA== 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=xvjJNLAAJ5/FUlYK0gCZXu7okfiwEQt09j7ml+3nrLg=; b=Myf4fRn5RW6Th/VeFFnufvgUx8otlD7lgcvvroW9f96UIzEobyU4GuhOofcl4OFuMeGqzRoGeLWCI53sQ9wQpspPKC7yUHZ1hMVUvpsHx8cQs0dvt5yT3C/ZppKIlQexdXIQdKVSs+Diz+9HDU2OzAljY2db4ejAyrdHIS2kQyGQg3NIQj1zs5OS3Osq5rd3FyamjAka0hPbKoqV71Whs5s521MKbeWpFTxaV4P8dTac1hmJ/d+aQWZ7b9qOAqqIheMTQ//lYIWhTaAGUf2q6N77i1wHPkUIxmURekasDrWG0ws8sn+e5hvtPlmVpvTwKlOjMm44I+x5mHMs3xFeLg== 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:18 +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:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Jan 2022 18:41:39 +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: [22HZRa4xqgQ5KfOGEEEOnU5WaIba4Hrh] 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-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dfec214a-16b8-4f79-4281-08d9e02a0824 X-MS-TrafficTypeDiagnostic: DB7PR03MB3500:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GAeGz1oNGRCStmHa22jHNb63oIgKFWGjGlo+9rGh6/t72G+jqEwu2VvWNATIrJrMv8JG23/4XmgYGur07ME0c9h4J3qQD38MV+FUGjbYRwZp5H5R75MQqKHNFtIxNuK2h3TTUhvSvF32NibyC+MDqS2AVuznPFwTsGat/Ya20FWJLxi7k7kzVndYn+daaYokNK75F0YP2/76UABrHXYtKuBv0M9wmLyW/ly2SN9FYVFpDkSxlbidOotQDYy2doza1s5nmXhX6jdlcwOllcdna45i8YC4Z6CWLLmPP4yPKnW/n3VzG6nD2fiZiAEoTz2Ne3gnXhvwvzQ+yTtvPlKZ9FjfoOuZehboZIjEYM/PEJRZEdfCQ2DOEzRdDY7b6m0Dn4ESx9Vh4S1MGFtqjeUqWkcOBN8ROtkJ3pzcrlTxr3arw2hTsCxmukgSJqW5kX+6nrdD72C97yTsxJ8COdc4hgvSu3Fs8rgLGXtDC5Ocw9J2kr4s9Gv0sWZbEVAV2pIYtMeVi1T13Wh3RulQojF9g6LLQOEGaY5PXfHZFW5k7i8PY74d78CU5ecg6c8g5NI3 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TSONzH3ky82YCUZS/QVqw5zTKSpGzpk94XSogK00wfJw8lJQoJpVQj89eEcKvdbEoG+7QdNa9dU+ztZ/2w2irk9Gdv/wOVLIG/o8mdXbQOaGIalrL+YhwHwwLDN7hxDnmiWHabVw3ZxIE/69+dXOcDOPQk8PH9sF9qe5CSpER7teTAGhxlY/u0GJjWwagD4wnbFlLl41/bX/ieuwCZh3gRBcpfYurhUzLO2KR3e19IW0b6Eov3xvmHTW7oP8wWr0WIdf/GX2NJDjaVcBdt5+KEEtbw2whtq6oDBLT2mVVQ4aLcm8+2xPJNocLl0jcBuPsMGHbqwo81stkX5s5OdK3rPtaO1b4Ma+FvYpGVwuJFqr5blsy3+D8Ki4J9C4UGnHE3VqL2XBfvk6Mxtxbv69/u/62QLSFfInXuugsvYjthJykaPGlivi16MNl/heaQoujgyjodJi/lei+83MdfqpVd9hSxr/znUenScklTrJa7Ldg6PxpecYb+9a6gDVzc6g9HbIvQ9QrgWe7iItmdZPopQq65LQ0Yg+ypS0JX1iXaLeBNk2Jjg81J4WiKBrpNg1iH+1GQElsSfd5a/ye5ff1QHP6jWJreLOMQqmsy/15RI38hV0DHsd0tLveNKivw3c4mIuf52ELK83Cj+DsvcRdX0iLXZZX9GMwl/TgJZPFUCBZj4QjCHWe0XvCkhWemk5hL4jWQYoyjJm7NUHTZiPka1mZ8yl/e4z+TnX38v/2tOEOgoyk2ScCiYxZs8M3qHUUm1K6zcNL9o+EQwOKmsLfCK5K8Ng3JjX9W+xyH47wTy7beZ107HFiNuyJmVbH/ALxv79vO+AI7e/zdzauAj8tLmBxYFgJmtmsjcLF0kkiId44kzSDVYcyohZyyvWWq5DpibkB4gD8mNp/5Ad4d23wqGSuz8bJgk68cFdf7erWs6vdxWdYQesYdSu8rnZNsypxK2V5txC7XmWLqOJuJZxaA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dfec214a-16b8-4f79-4281-08d9e02a0824 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:18.0415 (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 12/21] avcodec/ituh263dec: 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: VCwVG6Psk2QU Signed-off-by: Andreas Rheinhardt --- libavcodec/ituh263dec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c index 0a032ea54c..7d7a1f01a2 100644 --- a/libavcodec/ituh263dec.c +++ b/libavcodec/ituh263dec.c @@ -1222,8 +1222,8 @@ int ff_h263_decode_picture_header(MpegEncContext *s) if (ufep) { if (format == 6) { /* Custom Picture Format (CPFMT) */ - s->aspect_ratio_info = get_bits(&s->gb, 4); - ff_dlog(s->avctx, "aspect: %d\n", s->aspect_ratio_info); + int aspect_ratio_info = get_bits(&s->gb, 4); + ff_dlog(s->avctx, "aspect: %d\n", aspect_ratio_info); /* aspect ratios: 0 - forbidden 1 - 1:1 @@ -1237,12 +1237,12 @@ int ff_h263_decode_picture_header(MpegEncContext *s) check_marker(s->avctx, &s->gb, "in dimensions"); height = get_bits(&s->gb, 9) * 4; ff_dlog(s->avctx, "\nH.263+ Custom picture: %dx%d\n",width,height); - if (s->aspect_ratio_info == FF_ASPECT_EXTENDED) { + if (aspect_ratio_info == FF_ASPECT_EXTENDED) { /* expected dimensions */ s->avctx->sample_aspect_ratio.num= get_bits(&s->gb, 8); s->avctx->sample_aspect_ratio.den= get_bits(&s->gb, 8); }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]; } } else { width = ff_h263_format[format][0];