From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 980B54B744 for ; Wed, 12 Jun 2024 13:55:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 782C968DA54; Wed, 12 Jun 2024 16:55:23 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2039.outbound.protection.outlook.com [40.92.90.39]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6978768D9D3 for ; Wed, 12 Jun 2024 16:55:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BLfu84WsrebG7JPJilVXA0SeGwjPWveNjXvjjNqSxAif4vbkRFL8FyPs9Covw2f/apQ0/ucJOpLg2Q8owy197SPPACWSVaos/75DuvgNKiM+6WF2NtUxaqE4fG6cxkhDMLZyl73wFv7Cew1bMjnrBQK9JX9bDmCvmujtGJm9sAB/run/2FXBE9zqKUfbpH7Di1CXX0EZQqKDPXvYqviIStEAywQ+fxJ+hXsc83G7ekgX2JmQ0LwApA09bLuInPbcZQN8r28lkJXkvWShzfHFK4PX3trSIuxEE1dnitTXyI89AxoAjPmWuWc7HcyNJM9WPkgOWgnUvZvca99lSgXTtg== 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=HKfd4Q5/AO+UghqnVG26eQKBQKN5HN2WzcwWYYnEZH4=; b=l2hwd10r3Ge3cMkPCzrjoPqo1FtlKAMDHHntWaQhKCr54fJR9zVn0xRuFiYZglv+W8WoU7hgmLdpjpHEiQk9jfU+19IKD2tNuPGuUVnAtb/s06jw/D3UOTMWBcqAQNJT4fTjtdVX43zsfi1vvbltZ6VKRkc0cwoTH24ucgsaavliBVpzgIxTf8i3+SC+4+6m6FOA4e9JDWoRG3Q5hc3YG1YVbi6/zrvVxwdlIDbcIf+JTQEGWGYcC0J2VwsLC30TEcnb5sUeZJvZqqSySwXKPdo5rBPtMxKkp3nHy8oIXFZRX6mrrWY+e5FwgEnEwL+DPDZHMvdnvnx980eCVSLS6g== 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=HKfd4Q5/AO+UghqnVG26eQKBQKN5HN2WzcwWYYnEZH4=; b=jSpUTUucXgxJTKdLt+8QLK6ix7vXw0qIWALl34DeUq4F6HNHGTWyBWEnIrCYYHIQ9qg0H1HdoNF2QLCpwPNZi8CUVDY9oGIjZkFksXqukjDHr+ViGFcM+3BGaQtaqLm2HQLL0rzSsy8UfXzUty+IR4ZCryRwhPUALvpcLYJ3mFKKWEfU7slGBrOYsym41HPZIL0D/Hm7BTUYqewt2yT3rpbTTWaMp1ZMdt68NTy9TC6LV4NlNrZGq5DQKCX3sNcR5PFmVeHxFo1TIVkMQl73gAxh6J2gAstpNQuKVilip8NP+msYEXz8NLQNyUsXTJ9UNPySQIiuvByqH/QaQ6vp6A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0272.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.39; Wed, 12 Jun 2024 13:55:18 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7633.036; Wed, 12 Jun 2024 13:55:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 15:48:37 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [zi192ceqs4IEgi/ebmDjhmIZbAAfXhTwGJq/9Um0zqI=] X-ClientProxiedBy: ZR0P278CA0189.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240612134853.2102377-40-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0272:EE_ X-MS-Office365-Filtering-Correlation-Id: add6207f-4671-4aa7-f3bd-08dc8ae74ae4 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199020|440099020|3412199017|1710799020; X-Microsoft-Antispam-Message-Info: +cDQysOm6yDr56t6W7/IuyRoXnk4Zy0AlUAuOOQLEc2tOzPSDiUiEGQ4jNlW2L0XYuHCo5HzygvLZlQAvDeeRvyWLtRa1oZNKra1fvSxI5BaEnuXEK0SwpTIFL5RlTwGqHdFNOCLLqbKn4c8QUFCBcs6ZxaCk3lClgbsP105vxbyLXGCDYpHqeZ7negVtcqU855HhGu30zan1+IzEPVjrbGg4iVrfGgsHMWuiNqJK3X0KttvZy6y53vdJZBPMg8UtA9/V0Kd+k57nEd/E1S4Pm0tFiMPGZvfM6TIC78aZ/XBdKhN2fGJd+6jq08VjrU8wdrpnEVNGdx/ba63ZwRqKxgC1uS+ZkUYsVPyTtZVW+0e9dG2gs98qPvWUBieCDCBM6nh+ccyAgjqzVhHcgiTy+8/VQYWKNTZjvltOe8Si7mtU8PpVfSAIIOXssDWqrSSUcCz3zm8z38FOw0Nt1xHw+MBohXmWYXLpZx0yhZLWwI/IGv9PUP4HHDRdUl9RigjV+uZ7XwaiFUXoFTuwVclzxcnMZfRCs5j9CjPxjjA4NktdhRhdc8k1xvv2E5StV5nlRL7SlV7hRDzYFJBXeZnruqorcqGpTJ9fB+QBZIzZFOPy4VKHjPvZE6WfXxARftV X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?F2xWMZV25RunIFM7XZE5ptYpKWq1WhhjAOwFbeuEhLEqfYo1ZdCNuNnU493z?= =?us-ascii?Q?pm1NNLQFQQLjfEo6lMUm8O58BBDpG7ZDqHNXwTFbHfwSXoGy1d3ziZYuNjlS?= =?us-ascii?Q?5F7PQ1vMO2IQiq70i2uhtr7JD1wRupnnMsgKbXCssvG7gY8sECEURLdmXGb6?= =?us-ascii?Q?HNSsYlPYTy1jBjkow+lkQCS+XEPRwiElUT7HnuWZyzziTw4DTizt+fXhIuQ1?= =?us-ascii?Q?uX0nrpog30H+6iGoH2OuoqCwqfheh7mKeZzgt0XS//9T3i6zhRacXuElP/4m?= =?us-ascii?Q?3M1VT04FoLVDBsBdxQFmReAcp9dv3u1jPjkzXCZUbsek9XcUW0nE0NXknIZb?= =?us-ascii?Q?RpHIRNtXCCklO9GbbVwjurKUaUPndfix4hoWN+mvu9h41/HXBam9KXpXBABY?= =?us-ascii?Q?rbVVC7VnfLCQQ+q3ohY/L88O0gbKC7U+X/+Z47XJjfLNNoBfT/744pwzy8Mz?= =?us-ascii?Q?oJmootrIs2+dhYJJTeY4jGBsEKnBxxNIiUelkn/HLf4ul4CnJhzDWBBPjkZT?= =?us-ascii?Q?sv/pn35YjEkjGqBMgRxNiRoS+qFK1PyvZLn/PCE5H3vXwDQIPiNGyJeWp2+d?= =?us-ascii?Q?P8Vi27ZEqT0eDQQVkzt57nE82DImXdGUGFK6hwZWxeKxHaN5dAlhcNYZW+VE?= =?us-ascii?Q?yHyp8fsPQBC1+x/iJ62k7x0HNHzaMZ1lQXLkuPPN8TmSanU8ceODYL1ZcJc8?= =?us-ascii?Q?1NCA+SRQlEbc2SNuUbP7fyJD1u/dv3kIextlwXestHYTiGdfZiSKF62OuMc1?= =?us-ascii?Q?7XxWkll4/1I+hZ4o/X/y8ncIOSiCyrV7xYG7Ts0M0yFr0pKI0KUNavfkHPUP?= =?us-ascii?Q?svFV1pONJBKnhraNdALMLzUYkEEKurV6WVtQdMUp23FChsShEbTQ9+W9DP4j?= =?us-ascii?Q?cL8xevHvrRCJfeNobszvKhh/kGzlBwVt3wZcrOE73ZkhJMPzrWZSAiHI+JVA?= =?us-ascii?Q?g4GZk3F8gwD504+SOSyZmdh9wvsGAtiJwetmmN542kjD8drnAuZOV8NQCmrD?= =?us-ascii?Q?8O8E0DswMtzz09WIo2a2yHeBTtUW703j9OmHwRgmdGKSIHhb9IlXgeeINu5U?= =?us-ascii?Q?msFur2e2uNYwquT4UgeZFzYTknlVDAbpAYXwVe1bCMtQXQYkzAx73XH5pTLn?= =?us-ascii?Q?hn26KSvzK2YTgciIU7cnsoI4gUsJOCWJAQfPX/qId4Ji9fM/hF+fzUkb51Pd?= =?us-ascii?Q?ANCPcyCnkqY7qWms+Kw9K3IWhyKx5cf6+jjbpqfd0Eruc657li3FzQNszVzc?= =?us-ascii?Q?UXv2mevjDrX5i1Cj+icauXAzVpGx0BaQmsK0NfqP7Q=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: add6207f-4671-4aa7-f3bd-08dc8ae74ae4 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2024 13:55:18.0585 (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: DU2P250MB0272 Subject: [FFmpeg-devel] [PATCH 41/57] avcodec/mpeg4videodec: Inline constants 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Partitioned macroblocks are always 8bit and not studio profile. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 116dc1507e..f1b542cebf 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -949,8 +949,7 @@ static int mpeg4_decode_partition_a(Mpeg4DecContext *ctx) int dir = 0; mb_num++; - ff_update_block_index(s, s->avctx->bits_per_raw_sample, - s->avctx->lowres, s->chroma_x_shift); + ff_update_block_index(s, 8, s->avctx->lowres, 1); if (s->mb_x == s->resync_mb_x && s->mb_y == s->resync_mb_y + 1) s->first_slice_line = 0; @@ -1141,8 +1140,7 @@ static int mpeg4_decode_partition_b(MpegEncContext *s, int mb_count) const int xy = s->mb_x + s->mb_y * s->mb_stride; mb_num++; - ff_update_block_index(s, s->avctx->bits_per_raw_sample, - s->avctx->lowres, s->chroma_x_shift); + ff_update_block_index(s, 8, s->avctx->lowres, 1); if (s->mb_x == s->resync_mb_x && s->mb_y == s->resync_mb_y + 1) s->first_slice_line = 0; -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".