From patchwork Sat Sep 30 18:02:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44058 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1204:b0:15d:8365:d4b8 with SMTP id v4csp513596pzf; Sat, 30 Sep 2023 11:02:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGy45J+Xvm0GMlH9n9HemkcH9BkO6rUlvxfhKS9RsA7rRxgpt+lk03IMKGGaK5tkrA4peBx X-Received: by 2002:aa7:c753:0:b0:525:6661:dc90 with SMTP id c19-20020aa7c753000000b005256661dc90mr6537596eds.25.1696096938386; Sat, 30 Sep 2023 11:02:18 -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 n7-20020aa7db47000000b00533f8df08acsi11152245edt.593.2023.09.30.11.02.17; Sat, 30 Sep 2023 11:02:18 -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=r5XNTs6s; 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 8782668CD17; Sat, 30 Sep 2023 21:02:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2071.outbound.protection.outlook.com [40.92.75.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C5EA968CCCF for ; Sat, 30 Sep 2023 21:02:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mumldh83CAjJroWjLV1xiPbs/YPwjiK60QTeTzf0/4Fe1H6HDffe3qY/7u7mP/dVRQUCoTHx8MVOKs7Webw0WD1K5+QUgAgQHjJz9y2M9taSMRdWjqisTLbINJpK4zwKUj3PuFBJ5O6Nt5Fug8/mLl4yInld5WCbIRymW2r+11liEqC6RxlLriv02I+v41tNg1+NqUeBN94ZfZb5Nr3LeXLZqqZHc4IV6ZmCK/fbmYCK/4JMiNgl0WpDq6fFBBwyNFyS3E/Cn2alofQx/KqpxFdjw68rjK2YJ4irH47fduYRDCSxgUPzrBgzzdlRf2nZoXjZs4aJK0ZAH+daZzUGbQ== 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=vxh1KUqT82Hx1NHuGRYy5nvPWftX1ux3EYeEVUQq13s=; b=I5vcTV0L2PUSXryMnpaGyDOqJOO84fUS/X9e/n3d/4cOwIjp78HvxwLdKrd4x/AxjJ/Nxy8h1cZD6gcUKufqfONXqxOmBpDZ1sqiGf0g6HB0+WNWmX7+rpHwORgkkfQckofg35uX//LDjHiylUIk9S0vdvbZa52LFJbYDLn7GrF1ZBuMKyWGXq0CEuGbo7k4X/28rfNIR2OqBAGJCqqVSa77DVECTxEAkGORgH2vW5BYEArD2PPRvSAkkOgL1/0ndSNJBMO3RZRBarF+v8NSSIxqeRuHZ6+gN6ol+okeuiqEyawV7HuVbAo6ZphWC57sHiX7e9Q9Y2ZFW58Xfz6bdw== 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=vxh1KUqT82Hx1NHuGRYy5nvPWftX1ux3EYeEVUQq13s=; b=r5XNTs6soJhMiNsSdABS+GXCcdP/pd76Qid0S7HauOnSUTWBdT+YqIOoAIeTmd4g9z86Teg/zRA4zKoobU82bPqKZ51CW1DU62WKDupZMylPn6R+Lq1RAa9QXdH31rJEyAsDjCmD8Uw9LYhb4Z3TTsobWVPkhfZfYBBE7k0nLggqPIU9js+iiY/hFumLbpM4I3P6c12/TXB2g+2qAw6UjydG/Zg6PO4+N9KhmXCaClnU04mOZG3jSGaFX0JXUn6aB1i5CcD+5+YRoLJY9DYRKi3BGS9OZloGpIm+WrjR9ITHSSbQf3bneH3izWHq74721U8hSZ13ni2+BzLHpmGJTQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0247.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.28; Sat, 30 Sep 2023 18:02:08 +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; Sat, 30 Sep 2023 18:02:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 Sep 2023 20:02:56 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [RH9sbfc8WTTh/c7AjIOsXvJe+S2MISy4] X-ClientProxiedBy: ZR0P278CA0149.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230930180256.2938262-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0247:EE_ X-MS-Office365-Filtering-Correlation-Id: e1ceae46-3b84-4e2e-6e88-08dbc1df5ce8 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7ncOnBsUVnGmUavz165eSnRfYDCmCye3XvM0g1EJ+iOwoj076CNWzqRJKLmBIJoDmOdZF2pZ+WYnSVADVvydTqY/f4IKmXd86UAqF8TiaNCv8azwaip6FU4KqB6NUljjA5Lxc8zFWnZsfsHe8euBps9hnA9E2dnSFXxXtFpC7+G76BsthPFJN5XZq29HwG6HPoCR07eWvaWOFcHqzR59FZu7r3G7+nUGMFxLOOrEzXbMeS6RhkQVxxyWMvJ/b/9a5lDX3zQ2abocaQI81+lTi8ldVNIiql6O7aipi7OGRk1OemOClgiVBZeOqdvrqnehy0YD07QuH2cR7tge/w2OpE4O0/rVVlHTImJYPF8yeGcpLSk6i2OqkJIrvJjE979pOhdf6bxIO18vxvsIJ/jW8cTOxiKxMQLdR1jKUOcei1NiepPl9BnRbRM/AN5Ezn5wj1nJ91/Kf2pVMqOPdBk/GjSYWZGvIAznzyqwNraqQh+DaOnSXPB3TcTfkuvEAl84Z0r+bhjiivFHgyqUpxFVN81ILXFxCAxuMBWQMxNdLRntzsAg/6nKcP7hf0vrL0Df/qmEOWCETWItYlCqwxwTtkksBptBAH/zWJTszaGKZHlJuPxxXexJ7bgj6lvGmolu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UNcBl1imeQb2L72r/6cAd2Qc/N2jbDLC1ffeqqgxUQzl+HeVZWOEtxzAtXESSWnbunhqb447XDC5N9Ojx2Qf4vjQ4F10i35wtLynqR/QZVlbZiW56yNmMtghwDUM6DNl7yo3EsgT07icwGfQcRl0KuAgA4r0Vmp2scOJUBc47LmIl8xeqsyDD8Ul+xxG3CpB5wjcYLiY7pMTG8Qy+v72JaqseTHZqnnLUacYaR53dQx/D3C2oQYxyv7QXuXIjaCX6Fz3BCq6Pty2Jkx+jPC2SrUz/2K7wNcUV53ASvZUEbFJ6LvSH7JWyqUocbMHGw0JK2O6KNCi9tLKfHAADOWachhQbYU5rLmfA2wb8uuKEipILzrwXSDc/GEZCaItx9I2bO70Ym5pX94Zln2G1ws21oju1aOGUTK2gAV0dj7ShgXEdV8c0V0O6o6Di5ye2KT2NWiwruX4cvSZ+isze3oQKO6HITnqtW025UEfuUKGoxvq8VWbcDVkNTOariilspa4umktC+u+EJO2HEiwNZbpSQiH0OYGtEAqTRHFDHXOu7gJwvZv57EdUkjIQAE/ERwOysRQMKeM4OS8WMSmEzYS0VPU3pbzdcGrvgvHndSmIzHSlLiXSgT0oXWOPt50nMMtjD5Ttpl90890bMzn5QooejlutBZONeOoTF2yr76s4GwZCo6UBEIv4GAlRHh4tFdv57VcTylUB66olJeVrz0hclYHmAtEhMEl6zLoec9mJGzNDS7mtLfDw6ZBs1jIKjL/r1I2s92uGXMUQELkQjFE7mZhompPxh0FAT8agPtEdbuce/CGxkwlI4bwY835ExXI0UL78XiPLJH/Rf3iBFf2xi+ATT0+qokHVweJx0DcYyKwN2vFBXcxNcc/mfb4LP4eYULEK3j1u7kUkdpo1E9goGBk/2e648KlRqK2QpT6z25X+L1YLdGbSY86WHMWjRZnE7vJ4NUNlc68XoNC/HU31vR4v0uH/VNmdz4cB7Mz8/mfDR6z8hPtT7sZ1NOtG1YdBbaf8Aqk1E0mGkfGWB1ty7npA49fsHH5d0C62PnH2a3z+CJJswwwm3ufB1fIa+TUeDbOtAS2d/3DZgiR+6bt1hdhvq5snN5oslG/lkpYGZ626dAqRUJURnKmOsBEtbexImjSNxpnlo9VFXySeUztirPwp7QLpH2qxtEFZxECGcidGvEN7JzBy1Go43HD/ncgGADjUHoBTrrFInE0+nnvQZvbFSMOrzCX4cok7T8qSxxy7m7f0q4cyPy6lBMjVKIt X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1ceae46-3b84-4e2e-6e88-08dbc1df5ce8 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2023 18:02:08.6389 (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: AM8P250MB0247 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/h264_slice: Don't keep AVCodecContext props in sync manually 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: r4Btb7mjx282 It is already done generically in update_context_from_thread() before this function is called. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_slice.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 5657327f0c..24f4690e79 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -404,10 +404,6 @@ int ff_h264_update_thread_context(AVCodecContext *dst, memcpy(h->block_offset, h1->block_offset, sizeof(h->block_offset)); } - h->avctx->coded_height = h1->avctx->coded_height; - h->avctx->coded_width = h1->avctx->coded_width; - h->avctx->width = h1->avctx->width; - h->avctx->height = h1->avctx->height; h->width_from_caller = h1->width_from_caller; h->height_from_caller = h1->height_from_caller; h->coded_picture_number = h1->coded_picture_number;