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 50F264B818 for ; Fri, 14 Jun 2024 18:26:19 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A739268D68E; Fri, 14 Jun 2024 21:26:16 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2054.outbound.protection.outlook.com [40.92.75.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 40B2668D671 for ; Fri, 14 Jun 2024 21:26:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C9A+u+rj1AaOupav3ZSkIrzWLNrCDtQIxWvndL1LfjawSvRDKIzIO41uoMPjJ3ZnUsGfEbpW7ZiXAN2rfdQrvQ/zzqR3dFb2OEmzFWhgs/DKXYVUFt+aGJMJvSAI+3TPu4YXy93YdyuosCRqWmysCcRVsVYLZ3GYR2J8C5aIisKxD0IOGyiWNF9xxFNsY0PpyGZXnh70LdxupApTrdFilGMOwj6JkEDQeb2CLB5EvkPDOogrcfwgrlaOjuJOBgr9DangjfolpIRSFnFbLjTcfXdsURyYQwY6Mt+kXlgW9xUW+1KLP6rApc0qksjEFhp3F58KfaTQ7vSslX3FlhKoXg== 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=qQISvyzXdyYFJS/e/zwdT6HRQKmSqfcPne0Ro9Lo6dE=; b=CWidy7gr8nwSFD1TxfbJn7aPWpzYS/2WjxqkygyTx+KC0t2lsYvbTDanq69hD7ebevUX7la4s16PhzhaXUMs1oWac5kEscS+1dKi2J/z27nVCAV8LmINj66PPkxqFb5+mPsmLwAc/j5nM7USQeBH9EYm14tH6yYg5jjaZenmgsje3AmvjnGyhqlEfbbHPSmmlQz4SOsjvR+Gx2U058dVDIJ1ZW95wNJzkxIN8+vSWQTyB5U0RS3GWXmyy59VEXNrGmk2AJL8LFR4h9qeVvoyPtgVvi9TBWXCho8kUG1EpXnDKoDIFBlCfTC/RXBNs5mzx4SOnAw0JGcUL0+Fh/GXVg== 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=qQISvyzXdyYFJS/e/zwdT6HRQKmSqfcPne0Ro9Lo6dE=; b=NRGR73Crr3Brg/YPFs9MZaYVdJGRDGvcbFnDJqE4JkyFMSks40qubklmNF7mnfIWbRFm9I88i9g3ZkaURvc85N+Sm3D3moMDLje64R4rEjWpQV1z4PsaOJQMzX6b0tP8AQtzmftsrP8CmnZqlQmqCszLd4H0kn5nswydXqUGL7QPew1Jq4MLOCF0Xz6cgtw5RCLTEzslgmGaHHTGkna2E52L2Hoy6oB9VzBC6xdFK1ZDHB63s/QBq2B0DM5JrgpmT7+VWnJRW186VLTMDXvnQqmeWq+BrjWOkrjacs/GGYHRzoBaffuOv8qPc/U+JGYSQWB/N0fL/cxg9iKF6X3EiA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PRAP250MB0563.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:298::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.22; Fri, 14 Jun 2024 18:26:08 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%4]) with mapi id 15.20.7677.026; Fri, 14 Jun 2024 18:26:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Jun 2024 20:25:49 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [pDPxRmXaey0GHpC15PKFRKW35RHZWn9Zc46br8wjYd8=] X-ClientProxiedBy: ZR0P278CA0072.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::23) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240614182558.3088802-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PRAP250MB0563:EE_ X-MS-Office365-Filtering-Correlation-Id: 11d92e3f-30e5-45a8-3b5d-08dc8c9f7587 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199025|3412199022|440099025|1710799023; X-Microsoft-Antispam-Message-Info: iVUt5tI9n+F+m2AfWCoq+pduqGHsepgX3OX4T3nd1cUybwzedUQPWSlulQWH4KtkAdAfY2ANxCAHPmCW/Vy2dG1OVp1XmowJek8yCPbYEsKvAhglKv6Ox/AHjnsi1+AYq+AsMILm0qm5/8rZ19rAEHC7gdJgU6CeTi/2ez0KSJOQuyaVxGR7SbKqfpz3wRRfpDZ7j9EGInrifYuKdEQnVCRodvO7o3Py9qeVnCBPK7HYcDQlxAuMCM/6wduQy26hTPq4bn5023SD2gqFrdj9T7kqq1+FWseEMEG3vfCq2BdnsI5/fH5QsB37VoXoY4htHZS6dzxLdJ+a8iH2YocW0DXf5LWEz1MzJf5u10LGGv9zzFbPbOrZcYhXGwkRDScckwxt762muVdzaoRzecTOhGtZWaya5Wfpgbp+rv4bNDXz2h1/BOuMVYW55jvie//bZriknn4xG4yXVge7To3QuLRDmlLxCFHKp4pwkrT9+RbbNgr/RuH8+KCGWPDCWJVLP0rjQ85HUNDXt6d+aZ8riOlk7gVqrTfCdwSZxTHeaVWZfAl7uziQHWTdzt7eUK1cQCIkaM2kkG89rsKTXi+ka0yO1jMJQ1Ao8NW+IsigOu6Xg845S925uJdZcOTI5yPJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5pUUrd/aj1LY8tR4Atv0+P+kfhE8OrIubLrqYxOkgCGdMikOMPyZjFlbZjdk?= =?us-ascii?Q?FVbUSi6scbwGeTi1WWCNvowt7MtZsQ1ydpgcTI702qdhGyHuszz8JBBxVHBj?= =?us-ascii?Q?/2SZhWGxDLSx5ncoYOrwMBI5cB22t1wq+X8AskM47EZqvKkBIPMtfAXHZ970?= =?us-ascii?Q?xYN1N4rhqK5TwA4Z+6k98j7jkmGw3rxEkOYSPPBrxRUeJQmk3afvYLnH8qz8?= =?us-ascii?Q?WRx9ywVtu/g3F9l5DOUK5JdDBTFd0ZbhrQhOQ0afpWeM/5F2y1vm3Cx0paht?= =?us-ascii?Q?0HBh8SxU64aSrfXxc5ZWkADkizTXATrsS0yk25k9B4MwFyRR6LTH4Fq1buSM?= =?us-ascii?Q?k5jYSbLxL08nNMS0pjsvN0L0Uvpyvc18mcvFy3e7khD18W/B2FbeK1MUdy0Q?= =?us-ascii?Q?QNHZt+NpY80okGoIGmw9O9AB7ZIa4we5HehB5fe36maeMxqadvy75dt0ZxY1?= =?us-ascii?Q?527u4OMfYH/M1Gj3P/EmEg+Lji0oGqOupf8yytiyDNfWarVMXVavzJ7QCNGA?= =?us-ascii?Q?fzTZ+fh15e26YfGvnb/LkBS6uNHAR0MS9qMP6Vd1DffU5p4eQllI1yLzX+K6?= =?us-ascii?Q?QgPSlAbbh7t/JtF3sE8tQS0bfSlzRpLy8WSOJU+Il9bxq/N7Y8BXp2kvn/JD?= =?us-ascii?Q?+mloVJRmrUKnQG4V8fhd7Cnj4DWwMUaZLVaf2ICEcWPZ1G/z0CyCwLYA7Zvr?= =?us-ascii?Q?otQUyv2d7p8F4ui63TaqOoz+g9agLQa7Psq9VzU4NGsdSJXYVFr1k+gMjESu?= =?us-ascii?Q?jckRQnELyVE+gIJkAkWnsGD5m98Ilk1GB6HsGn9UMPzfh/CeIGqVe+ebmlGN?= =?us-ascii?Q?dSfZr1WowV4sz9WCbSau1pBX7ZQz9bRQQi5pMMix21o0w+24l2O6sDOq7PfG?= =?us-ascii?Q?kWmh/bOSE6nL9HiTMiUnEImlj6sqGLqPgMr8VmlFYhgdkIgzh33owuFhIqwa?= =?us-ascii?Q?O0bTQNV0dE1qQfoe3CHTbRqNrP7Ho0gURwH7qcQ9hZeaLlIKZuNUn08UEUtB?= =?us-ascii?Q?BJ5u8e/0C3sdPZiqL9nwzu+7m/IuZxbQnrb1AO9Y1OEFqKzqRxDlY4GXY6FW?= =?us-ascii?Q?BiZF3hUsP1xiAgxePdjIxnvFLy7ZbcIunQvfjsMYNjWaSL86QqLS8UKviRrn?= =?us-ascii?Q?u41JLtPqHnp9TfyZd8fI7fFxqZ9Zqca+xlWvzskwHtPZAALRjEibqtam+zfg?= =?us-ascii?Q?WXALdX4cWLvYWws9zBOsiIrUBywpU4C4D5Nh3MQUieeieGGB5POoVa0/aghr?= =?us-ascii?Q?Poiaj79dZWjfbZIzASmMEmdOuO7/FwTGcI8syo/QVA=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 11d92e3f-30e5-45a8-3b5d-08dc8c9f7587 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2024 18:26:08.2474 (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: PRAP250MB0563 Subject: [FFmpeg-devel] [PATCH 58/67] avcodec/h261enc, msmpeg4: Avoid setting dc_scale_tables unnecessarily 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: It is unnecessary because ff_mpeg1_dc_scale_table is the default for both dc_scale_tables. Signed-off-by: Andreas Rheinhardt --- libavcodec/h261enc.c | 3 --- libavcodec/msmpeg4.c | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c index 01bce533a0..dd4419ec8c 100644 --- a/libavcodec/h261enc.c +++ b/libavcodec/h261enc.c @@ -34,7 +34,6 @@ #include "mpegvideo.h" #include "h261.h" #include "h261enc.h" -#include "mpegvideodata.h" #include "mpegvideoenc.h" static uint8_t uni_h261_rl_len [64*64*2*2]; @@ -388,8 +387,6 @@ av_cold int ff_h261_encode_init(MpegEncContext *s) s->min_qcoeff = -127; s->max_qcoeff = 127; - s->y_dc_scale_table = - s->c_dc_scale_table = ff_mpeg1_dc_scale_table; s->ac_esc_length = 6+6+8; s->intra_ac_vlc_length = s->inter_ac_vlc_length = uni_h261_rl_len; diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 50fd581a83..872dc8db67 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -41,7 +41,6 @@ #include "mpeg4videodata.h" #include "msmpeg4data.h" #include "msmpeg4_vc1_data.h" -#include "mpegvideodata.h" /* * You can also call this codec: MPEG-4 with a twist! @@ -122,8 +121,7 @@ av_cold void ff_msmpeg4_common_init(MpegEncContext *s) switch(s->msmpeg4_version){ case MSMP4_V1: case MSMP4_V2: - s->y_dc_scale_table= - s->c_dc_scale_table= ff_mpeg1_dc_scale_table; + // Correct *_dc_scale_tables (ff_mpeg1_dc_scale_table) is the default break; case MSMP4_V3: if(s->workaround_bugs){ -- 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".