From patchwork Fri Oct 6 02:46:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44179 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b1d:b0:15d:8365:d4b8 with SMTP id s29csp117204pzh; Thu, 5 Oct 2023 19:47:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH71L0HH9ZfI9ijh0dj+xxfpklT3lmjSkmxuV5yCDBk7n9bF3Zs7vALWuSrKY79CqZXBK1J X-Received: by 2002:a17:907:77d0:b0:9a5:81cf:57b5 with SMTP id kz16-20020a17090777d000b009a581cf57b5mr5521033ejc.2.1696560434268; Thu, 05 Oct 2023 19:47:14 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id kt19-20020a170906aad300b0099cd52f95dfsi1227728ejb.332.2023.10.05.19.47.08; Thu, 05 Oct 2023 19:47:14 -0700 (PDT) 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=HJ45qyVR; 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 0E80F68C95C; Fri, 6 Oct 2023 05:46:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2060.outbound.protection.outlook.com [40.92.65.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A48768CC5E for ; Fri, 6 Oct 2023 05:46:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mE2ShO1Qb72xgrNpIGAkkAH/WXGi0Wf5/YSjWV0/aUV48zkMn2GhnsUGwrnet311OkXp0OfoCg7PlrvRNqEvnyplda7BowM1xUKsul4FTmJoVRAVZxE9i67GFK9mIdvdkdXepFQdZxFHnN+DvVTW7u8S0GEKg6UMpD0E7wR3vs919zORcH6Gmcx1ltyIoGGQw6htVpKF2Z6YpYNryH2KA7O6ukCYpjA5QSQ+HgB29W2COhS/N+IE2YGrzer49E2YJ1DhMq1R/ZR8s4S3f2TvyMT7aPoeCrJmwHezzT5EH/pQt6TOf12Nxl1kvfbifp2gX/bbgIff68fRkNv7R7ojHg== 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=doNwkGRsjXYkBFVNs09fGWdgsym1mBhuVN4cIWooyTs=; b=RgVXi7XgeaOBmNEe7KYfAbWUTWIZqU+YbJw99R64d+dRA8kQYpVSaYb5HxQQ5GcyGLZgBVfoll/lnr+bv5Kat9qKkJkQ/FQliFvp7ciCO0TdPn/vbmbqcDwQBy52QgE3uQEe/TYiSXixgD+ZJCIi3SB+zRKt08+cwShgsCFW858gMVH9hNOr7D6Rw0OjkGteIj23gw5xmY0gNI+joc9YnRIhxogWc1cb0MTxqubvl5yfpBEtZqX/ATFCssOl9/740vjPTnG/5ZmexPWFuNdtF0obCZX/zdyQ42EvzwOaYgMZDMWhzuX09EM2DSwFKebfukPzsJ4zN565WwNovW3s7g== 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=doNwkGRsjXYkBFVNs09fGWdgsym1mBhuVN4cIWooyTs=; b=HJ45qyVRf26xvjvdU/UrnKgCPoRb7q/l1uHmkzE6+Ut6aBzFTUfLm3FfVKdB3wJW0aQBnxKcwaMC0hDKYyGnJkU+WqZtEGlbgSHlthDM18CHTroSj+/CVd0fW4d8S7KKteDXYnnC48qqivGUoufaTdhT39ifbJXCP4em2X6/Cx3CeLYrtVJBSAOI15hu+bwWfGogmLv2SfPyXcXufC8kefZj22gaWGTGmfzlbNnRNGDiqMKxCmOQNqw617YYHZL9bdt1KYS1Z8Ly2C4oUdovI9bYo+V0x5oHMdfQUXYmQzMNJmvOiSsHmw7IP7s4LePlQoSCRbfqhprps3F3kW9LbQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0148.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:275::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.37; Fri, 6 Oct 2023 02:46:13 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Fri, 6 Oct 2023 02:46:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Oct 2023 04:46:35 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [6Dgez/1mU3VLTFbFrzQ+QZ2BGBNMZKWr] X-ClientProxiedBy: FR4P281CA0094.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cb::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20231006024636.1005349-11-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0148:EE_ X-MS-Office365-Filtering-Correlation-Id: dd2551ea-b85e-41f6-e7a1-08dbc6166780 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: luFqtoasvy2du4RdsQEysDSPyg/htnC1LbUICcse1W3hYaWpA+ZGeLKFx5XTc0K7Td6Q/E2GGiTLWKZIJT6y3ZBs4fhgn99s4m+b8dBrSCuBQ4BqMpnBhp2+BZhwqbdDNtuNslAPiHS7JmwW+C72CQ4Ywe1HfOLmqQgcgpy96OWlE1DJECPg/fC4tUto0hDAG8DRRkalLrHE3b6yOPFeoAtWqjkv9H3KS8DkLblPJ/7dk/hFMAE0rih6moMmi8AOZb/bnLkaI33WiCoJvoH/VbYIBOVgBDCr3q0WfvpuKz1+kq0L7nG4zgCTMYHE/+mDEeZZnp3rsslxG4Z3FWYijrNlQKOtvt4DkyasdHPCBCAIlXmcFlIQtwAn5RWG7faEJABnc3+p0CNoTOnl+WtHdr06U1tsbQ1iYjPBGrBqeFRRun7YouCC3G/YThPEPCOow5P/6oi5p5q9Z3rMPp+cI6Ro2DGuNOdZHZMnMsBi2ZNXn6k5Uo/0SQnELDjti/S3hgZ3dUgkPYTJf0eSkQ2iSQxxvCLjmBCaAuFpsMCNTbYSesWnfpZt8S+rN0hBxWfkthgpL28j4A964dXbMH5/vnPJmaJZuZtSE6l91qjkdpY9ujB3ap8srjunbIPCKXSK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uDnAbggKW5NNWUtNES2LR27pM9GI/XItPuEQH2LRnjJlJY8y+wvOdWDuIH5+4+s8kTmVxOv24wnVosFpb3irzCzt2NRY4W+sfTY1AvfRxblL8ktJT3Pq4g+m96WGgdEFvatXUWTwUe/Y1lFknfIsIsn1arf6NMu7p4KMqf8rV+FWYgE5A3ymoXQYfzT9mqCc7WV/ZfJmmvScmXYArA9lg2WWxhdwh4bY1nw8HSjKuUzwZ9piAFJDItRr6Mxilt/8u02j1Z42ywzSZVrE6sF8Uo91AwJvYFrkN0SsApjSGpO6pC6EXo0C35Qwnu2rzkZ+eMlVDlt7OQneXzxQaVQToS8qWhOIO6WL6o/ILSF8uPX4oF7XfAiHCYH9PNMQML6wkzMz0Q+f/xOFRup2kgGrb9695d0OvDGBVFxYz2gVldbAZFMJAc2+N8gmbXLpn2eC7s3seI5EsbZNpJdmhAEDTCoRYFeuicAvN02G4ncOofrSDyAIAkRRi0MJOHqm8OOOjlWIVBmqX6XT9s/N43Aq1IscElE76pAMMbkMjRqXAU7Jj9oMAUB708TgL62CwMokp5ibiVABfwBZ2qNfQScb9myYuIqKMqtzWfZPQK7RIIR2Kv0KgkX9xw27OfF4Kqzi5jmt51sNcM4sXusEnsHblH7bX17jEczmRzicFGgmNKFKfliVlC8Vu9OzhiK7Fvd4TyV/xKahGSFlxGShdsGnmXlBDGdBr5MJVCgXXuUCojaXEATpkXskT9uPCaej3b4fvT0C1yZMxw3mz9C0hLRhN2/crD2a4kVw/Bg91it/6ORPjo5etUsLoQzmbjJBbyOznAfBY5d7yxFP8D2JPoQedNmNZ/835FntVndjdNGolZLatwOuu6YyQnGZd0OE0wxGAJ591v8Nz+rXujilqCQNaBDj0Ij9q9EbPho6Y0V9c98pu4p+sVbywYKZWaUEJL3KDXDZhISVtf6CrhYxPvg83oLCE0xeInEu1AX7ieA7Y3/AGpClpBwiQgGeXds8zPyv9K+uduYjQcrn3TlAiByrIw7M3+7PIK4xkhst0Zc+0dGBk7qOaTz88WMngyS4QPnkKX5c1BbR+Qp+YWsrk+3ZHjzC++5TKm8TtisruqEDR/1Ot43kllW6Z0QVjvfcODq3SgtqiJcPzj72M+1IJ299bQLabZd5udLUpFJHm6igZDIWggxeWjf99bet52xwb2RK/9ANjgvTIIgckgayniowHgMjRel/6lez6s/Wrj8h+D0vHQnB2gJuYuidC+JwxQ9+ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd2551ea-b85e-41f6-e7a1-08dbc6166780 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2023 02:46:13.3499 (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: DU2P250MB0148 Subject: [FFmpeg-devel] [PATCH 12/13] avcodec/mpeg(picture|video_dec): Move comment to more appropriate place 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: fnt1HRirwk1r Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegpicture.c | 2 -- libavcodec/mpegvideo_dec.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index 44c4c8fe93..f859f163a6 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -252,8 +252,6 @@ fail: void ff_mpeg_unref_picture(AVCodecContext *avctx, Picture *pic) { pic->tf.f = pic->f; - /* WM Image / Screen codecs allocate internal buffers with different - * dimensions / colorspaces; ignore user-defined callbacks for these. */ if (avctx->codec_id != AV_CODEC_ID_WMV3IMAGE && avctx->codec_id != AV_CODEC_ID_VC1IMAGE && avctx->codec_id != AV_CODEC_ID_MSS2) diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 4e00137cbb..7a9101a781 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -242,6 +242,8 @@ static int alloc_picture(MpegEncContext *s, Picture *pic) pic->tf.f = pic->f; + /* WM Image / Screen codecs allocate internal buffers with different + * dimensions / colorspaces; ignore user-defined callbacks for these. */ if (avctx->codec_id != AV_CODEC_ID_WMV3IMAGE && avctx->codec_id != AV_CODEC_ID_VC1IMAGE && avctx->codec_id != AV_CODEC_ID_MSS2) {