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 8D26B4AB2D for ; Wed, 12 Jun 2024 13:57:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A857A68DAE6; Wed, 12 Jun 2024 16:57:22 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2019.outbound.protection.outlook.com [40.92.75.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1AF768DAC0 for ; Wed, 12 Jun 2024 16:57:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mkGex69LLC4kCElEV+EYzUsUtxfTzxaiFbVm33Mf7mNSKk4EK4CvK2iLqStPbsZum5/ZphbmbftSrCyMoyP9PwM0rrqhTR0M9S5Tdpk8PAfjZ89QzB3x2M1bE5R3SvE1ChCctoijdlscT3KSgLh6PN8qIF0S+hFV8fOXLuPnKyb/kagu4+a07NB/X2Jv1snY4SllsRLNzrvOSsoV8Ajbe+bCSmu7cqf+4YwSFfQB7vNaZUMTAYBFa3nM01LrccGr1z9UeKok2DNzR2oCyKmtm5ObZnLmPwfCeF5pBDdCJTAatAyuNhqd7+QGu5XQH079OcA4/d1ZAE5j9T6nHJc6Iw== 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=KD+NSgqgM3wTUgrtDBU1gpXChbCidVuYhiaay/kzDkk=; b=jMVreu4eY9X2rutw2H8xZbGbf3O1MtsL4KA0KOva/18H8OLzvawxJFBM6NVm0bmvMPt5sx6Ht9LIOcaLzt7qhG7c+0BzUce6vwCIzc7fmwKrIKdgkXavflO00g8g7cmhhZNbkWuvK12CwYaO3XLTvmZNk1WEXWqdEEPsFs7tgIHYQJmfCezw3hLu+JSzNhWK8hmuAr/1FhByOdlriuk77HENOlkbNX3fXbN79pxilCKjJmB/Bl1j9c0wpkMnlk/TRUPYrBG02kT8oedXQJwqTpO7qwoB08fkv5cveSpi0s0N+hWJOuNvLbQdSf4FOw+/YdNPP9fAo6p0V7CVvx/nLg== 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=KD+NSgqgM3wTUgrtDBU1gpXChbCidVuYhiaay/kzDkk=; b=Mys9wi/ZnPhKF3v474Ozr1Hh+AkDGuo6B86CR1m+QRQgNrNyzFd8uz6q+y51vO4zfPvDgtl+R52BWV+gl6nUrQkO6I9Dsv47CYlXJgQElQhVlpTEPVyU+aqObDXK4n3eHUPDqFL/oBblkQROCQkkvHX6oV+3rZF7ImXV+hyf4p+aOxtPHMaJ5nb9fDHbOqi513ZWE+EoSa2BCT+j7Cq6Z8t91de8tcxwSXLK8/rmGgdOy5/xbIJMU4BLxmn6wsKCJ2e+3Qq7GM3JWpAsjVhTFzqRgcWS5yj421rpWD0pXdrEFW8W89ka6Su0XJFKLRi8r5Ud7KfCpUMrAphM4A1w7A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0232.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:327::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.37; Wed, 12 Jun 2024 13:57:12 +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:57:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 15:48:52 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [uYqUlOQ0fcohiMkx4IGUiHmT8pCKeo+RXl8IPt7pik8=] 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-55-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0232:EE_ X-MS-Office365-Filtering-Correlation-Id: 279aff07-117f-4640-5a6f-08dc8ae78ebb X-Microsoft-Antispam: BCL:0; ARA:14566002|461199020|440099020|3412199017|1710799020; X-Microsoft-Antispam-Message-Info: Vnf28eciubfPW+3T8nXuAhV0vqQ/LZHdDhvebDCLN6p8Ob7gjyMohRGULZ4zFEa30xZ+ZIdt2LEkMFPngxa8w/0Cb5H+viBVf0FBHwozxvswz3ycRa28jj/IPVg9rX+mj/ABSKjtGNnAtTc7kJrRFspo5LOe9+Ol8eFHec00GTNRuQMo3yM4YBErxClpTVZ1vF4hx7s66YzhfU4gPNhx7XOdRjDGrVrcRF4LVRpU72KaOnQJNBrb4fIiFW4QIc3f6ipDNTO52uPNHWSetSgMcimHFN7/gGGxMnuHP84USAVgVoqEKQ7qFOE1OE8zSkQtrXcw+RC/XHCL+vyJQ+VMt7ucKSqeUDMqbX8fGNguPKYlJlvaWbhXzRYDQ2T+GyGR9NZogbWT9dHEHQAhZzlCatTHyjXKyGUtK6BibH4Lgt4GOBAeoXwECNuwzpBBiGqzRRnaaKtRIpbDdjU8kqo4inI9gVaTfJY5EpEVmke6bdweQR09vH+hFlbkMKe0XrLGWD5ysdkWETjs/7O0dL9BRVi4nX0brtUj+4XLRmqrq/uHH1HsUNe2AE+/eusWZ/lSLgzssS4EqYsnpIcJTGnDO57jRBKyLy+uDHU7u0rFhllz3YqxHNWf1Uh2Xl6dJlXs X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pqh1DrF0zmbrUQMx+7T6gDP9SL+7jOMSatpkM4FIGoSPhbWOLDr65tqI+woy?= =?us-ascii?Q?lx5G05LxWsQDC/eaib+JgpdqCIdHCIJ3hBAmDDP/XI58wYwy1vS5fAP7Vnyt?= =?us-ascii?Q?NUkd9KTSiWYaQrrkbEacnR20I+lgU2ipcoaXzFSYDSKrWSebiViPURSupWRl?= =?us-ascii?Q?jGEkZUVjgURhl7iZdtRFQvvnQk2FPs56WwGSHvHRmNS+kj4MzZrB8HPbt+Ye?= =?us-ascii?Q?Aghc8M9Eq2McQPdONC3wagEZAOmnzFuBEnQvxbcOMrQUxCOh10DS1tiBeXgc?= =?us-ascii?Q?WXbnOL82coQsEWHC7XF7fzyhQ9Ev2+a2EI2+MPxTr5eJ6qfsh/lfQSz/7OnJ?= =?us-ascii?Q?DrKsKmKHVkC7ocH5voAFeKeKAW6sPXYMNEaWmmyweCE/RXM72/CuBAmZwNKh?= =?us-ascii?Q?pcwvzDBufuwFzGOSFr4pnm2hJ7dpcokAhiBsDIgUJC0Wu+ktUFFZwkRup1Wm?= =?us-ascii?Q?gi+cGecUNNAQzLH/YW4vzx6mTOMXQ5JrchIrTa9aUwJBO/LVVYj7KhMahlMS?= =?us-ascii?Q?0/1KJ6E0qtAdnE6T/xk+D1GeLCGpG5D+JnaIFOoAAswhAavuUz2YqxrX+TzF?= =?us-ascii?Q?15rNSlWn2rmza536dp9t4y981pcw7F8SEotKcnk/pdJ8PeE9AN8TUzicJSrH?= =?us-ascii?Q?Hd6mSrydoEL6OPheubXEBIyj14qTeqakAFEyTo1cWWjG13uTFiacrS5mmFgb?= =?us-ascii?Q?8t935k+b15ZfgRby72un52UQ8d4HTVYl+iXl4MbnhSUBiG4iHt+CN7qziAsg?= =?us-ascii?Q?rk8abqNchF3cEz7hOSO4c3CiXiZJr09SorzX2zS+oeJmmRd2HU5xZPN79W2T?= =?us-ascii?Q?88XQObvSR+cBYbw26RJdbt2xlxCBCngPg0HF0pnX2Xc6o7DE+97tdHpTkGmZ?= =?us-ascii?Q?OljjbcGTG7G5oXVV8RZQ5zH7BluhV2z5D0PSqQ8m1ULTkJDX481w1uIZEqkv?= =?us-ascii?Q?qXTHKfFLnCiR+JCF9IvUotf4XofGGw04rCGnkci8j8JS1Ul1P8TPKbNrnL47?= =?us-ascii?Q?zAr0gDM+v12sDjUyFmPc49VW0Nkyzxk5Ds+dUH/FQtPyEDFJI/n3otReGL63?= =?us-ascii?Q?JupZ/8pe5SH9I+MDeZK8UgCwDD4aMYjdfqb1AsMXnilfIBFdei120LPqrgpH?= =?us-ascii?Q?H7h/PHmEFGIweLNFd49R6hLzOYQhR9ksLKIqDbXnu6PO6HycapUgRqEoa2Lj?= =?us-ascii?Q?tj1aQx0y/uFrayqkfa9A2UijOU8KuzhycGqYIbaY2+iKclM2YAapFW3htWH2?= =?us-ascii?Q?PVPoM99MtxFyFf9pArhqw6yhpNmAnIiuimbKzsrj2Q=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 279aff07-117f-4640-5a6f-08dc8ae78ebb 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:57:11.8834 (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: AM8P250MB0232 Subject: [FFmpeg-devel] [PATCH 56/57] avcodec/mpeg4videodec: Don't initialize unused inter_scantable 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: inter_scantable is only used by the dct_unquantize_h263_inter functions, yet this is not used by the MPEG-4 decoder at all (in case H.263 quantization is used, the unquantization already happens in mpeg4_decode_block()). Also move the common initialization of ff_permute_scantable() out of the if. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 130cde7a9d..77bd3e9947 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -3251,22 +3251,17 @@ static int decode_vop_header(Mpeg4DecContext *ctx, GetBitContext *gb, } else s->alternate_scan = 0; } - if (s->alternate_scan) { - ff_init_scantable(s->idsp.idct_permutation, &s->inter_scantable, ff_alternate_vertical_scan); ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable, ff_alternate_vertical_scan); ff_permute_scantable(s->permutated_intra_h_scantable, ff_alternate_vertical_scan, s->idsp.idct_permutation); - ff_permute_scantable(s->permutated_intra_v_scantable, ff_alternate_vertical_scan, - s->idsp.idct_permutation); } else { - ff_init_scantable(s->idsp.idct_permutation, &s->inter_scantable, ff_zigzag_direct); ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable, ff_zigzag_direct); ff_permute_scantable(s->permutated_intra_h_scantable, ff_alternate_horizontal_scan, s->idsp.idct_permutation); - ff_permute_scantable(s->permutated_intra_v_scantable, ff_alternate_vertical_scan, - s->idsp.idct_permutation); } + ff_permute_scantable(s->permutated_intra_v_scantable, ff_alternate_vertical_scan, + s->idsp.idct_permutation); /* Skip at this point when only parsing since the remaining * data is not useful for a parser and requires the -- 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".