From patchwork Tue Jan 25 17:41:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33843 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp832259iov; Tue, 25 Jan 2022 09:42:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJxQ8BlqS5anL79HQNj27W2zLbnuoJE52EK/tZzbhGLX3LjrN5k8904stVFqZu3iu/G4SEj/ X-Received: by 2002:a05:6402:184b:: with SMTP id v11mr21898541edy.84.1643132547840; Tue, 25 Jan 2022 09:42:27 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c6si10075843edr.14.2022.01.25.09.42.27; Tue, 25 Jan 2022 09:42:27 -0800 (PST) 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=R27UjCJe; 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 A95E768B04E; Tue, 25 Jan 2022 19:42:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068072.outbound.protection.outlook.com [40.92.68.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4497F68AFAF for ; Tue, 25 Jan 2022 19:42:04 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DnJCSKLKnZmfk8+8/yA8/s62x3Vge03Sm4VNbMAuUgXOUT4gIRFTwwvHwiNXSLo0xnR4ndGz3+BKhe+Lsfex7zU1D6JkgoveUMY4Zi49pNGD790DjaHLpaX4ktSa7efx4ZbeuALfAMvxddLDsflN+VEHLPBwqP1vA6J286wlKrhsOXTmUq/BKvxioruv97n0m7oYVQG/nPmHFIDMPXc2C+daqXPWReiD+Ue6w8IzMiH5Hd5yEonlFfD/i+X4TfGoR9kiKkMyrZvDB7BteuncAu4kdNHBXpItaHGu0SB7glEYsJkmD012W5Th3WEmWHVqzFTXVL1fk+cqQaXURV3XRg== 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=yJVS4YP7f03bVX8ytfdVl/bib9J/xv9naBY9UlMxxNA=; b=OycPJaj9Y6FgoJRHDA2JJkz9KvAVsV2KEi9mzNiI7sVakjn8yL970ll8zyb6l1rpBC+/6+LY4O/eyaZPtijs4EAS05UBP0x4QYCWw2sJO4p+sDkv/3VdLB7U8ZZZZ5dsPRnPyki3YIg9Ow0T9z8jalUhYqKNhKXE4oFTqNMR7jg2l0wDnmvjpwlGpuBDNSzPAVa/OWqldcX+1BsVu2Z3JL14neXdT1s8VnM8JtMUU1hFLj8FtI8RJ/i/D87+MZxFUvtjKNTNWPrNlhXNQacWe1fa51KX5xYi16CWOCGX0YrUhVQZqNjPjM5UZPxLaqHClZCJScB7rfYg/1WP+yMyFg== 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=yJVS4YP7f03bVX8ytfdVl/bib9J/xv9naBY9UlMxxNA=; b=R27UjCJeQnDDl2guTcQu9fsWp4Ce+xcgCJ0PwpzXNxlzHUiyr247sZfJPZz+By9lvraseKxEl7LS21Aa3tk+/4WJ93l/VvX3P5TiXGyE7Ayhd6lmIt8TuHOtRVWB69VdWQcQccRSO6v3xHazgT2oyqrHozIF6bIpA/mpsAE6Ym0sXi+IiXovElTYFKwjbi8KsIIXQIoM8m6FMwEycf5NDpH31LVtx3HD3ggVbwNmP7YMcvdqwlxDp0eqyx4iBO8qQnDMSquxFBjkMsHvbd3F+n9BFI9KcvQwpOlUmb4S7u/DtYrCkrEz/T4eqxAzKzxKScd4A1A74BQcMT2aeHBgIA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB7PR03MB3500.eurprd03.prod.outlook.com (2603:10a6:5:8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.12; Tue, 25 Jan 2022 17:41:58 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4930.015; Tue, 25 Jan 2022 17:41:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Jan 2022 18:41:31 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220125174148.994967-1-andreas.rheinhardt@outlook.com> References: <20220125174148.994967-1-andreas.rheinhardt@outlook.com> X-TMN: [0d/HSxFaGZfjKZE0cKHUZhVOLDvXub6B] X-ClientProxiedBy: AM6P193CA0061.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:8e::38) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220125174148.994967-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c73bba5e-9b11-480b-60ea-08d9e029fc58 X-MS-TrafficTypeDiagnostic: DB7PR03MB3500:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7pPHgVNeFBC1un9tcbZUzPjPAnqvdZY1FjOlCC4cor84YBY3v/k6GjiVf1o8JlFtlYqE4ansK32IfySzIAYbwUMUlTmxi8im7bO2fk5ZEyJgGQNQefX2nvE94LlYVooEB19HcMuz/JqpvOP2CwANewxFV/c3E9RQyJQVmfa0N6lYnL2A38fHVeIF42zROw8hjmTxR4ZqqcQenZ/C5G8MhXTXG/CUxI6QwWpws5COfFQ3eodYrF4NQfqngcQe1Z4Hpqgql1MzQF9KawpnNnWuwnbGtoUwB2JRtQRR/gK08L2FElc6hCF9CzoDzhWV2htNFlvZ8Uf5iCSvzUpA0MQxNIXMZ7dqzLcofFfbkdHJv4sXaTp6O4uEOmD+y+zn9j4EwZ49KmoNH8qWtPS/LdhVItxx3w/mv7S4O4j2pMPrDNx8n2XsaXKQPsPN2TBpGBTPxtY8cvOiiF9PBw3MCj/JiuqJH8L10kr7Tc5szDcQfCYzVyQlCrAi3VS0F2aS16oEDHn9J10317JJrXsbCo0B4//zf5UI8zu6nSi49CWDJib77g0HVMNDH+VDqq1JT/42 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Hna7tuNpOBdRN5YvPctPtrkuIjJU1b7O5Lohswd6ZyPrwh2mPaYDAKui1l8ZH1ARZkfi8wAxQL+JYDU5pYClmrrHCWK4l47eu9aSnFm0N0crGR+B8hsdWtzMplXHVO+lApex58QGk5i74XWvaQMfTWNCAj6vWL/b5wAANf9NhZXW+nbzYpyiHEPxCliI0yXCJzZocIkbozdaE6dGcbcYjC1J3UKspSYDxCWVhUGpbk5ikblu560gcQFi/ZHXdyvtHhSGrQ0FYvPkGnSZoN46AIVWZxOYQ+Hk+o2L8bGYLRCT88Lm+aWNvknTId9ol/s1Qc6L0dblRdw8a21O0E7uC3F7epTnZLoi95rype4k3oCa16B2Rs0enfiMzDwzAC1Ph7AnA3yyWxTvoOM+UpicNHEWBq1Isckr3EIYvDtTvAbOKWBv+idDy5eCc5DVz5r6AiwF9iIcl1AccRkp2+g2Ck96mBP86wYn/euITt+PiVvrQ5ox+xb9WeCjL73E5E6Mvc+gJzir5Gcq8iUvp39hb6wku354tx9zgPhXio1tovM28cUW8SFJipRnZZ5CBn1QkMmhMiurOXR7ukV//sQS4Iy72oSSKMg3Oh3FZJhI0kuyA7HRqolET2l76S9T4ai8nnHN6aH+K5B63n9XCSFEDsXN54tBnN4VIRUQxzM2+3mzF7qXQ6TpZLTB6pHpGH3W6DbuSf4H+AmYXbmVYKKzsZrl3AOmrH/frS63WpJp3N2KbLtxHgImGUfDo/w9e1vZXoq8IOiwTlcbya18SWkmT4t6Ue4wkAHzv7E6wVrKfqY1KRVZ/yUh3/ZXsiW33WiiH8XBkurEors0s3eFRde945rby+rjVpVNyGYogP0aTBkYIK8E0blk2OK5XaFxgFZc/rTvUBmmTVUgm59XL2oTZhe4meyBUSmdu6VMgpilRKZpAp7pwuY77zciLm/kqBY1i53/4kaYvfEWPxLrgMlKBA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c73bba5e-9b11-480b-60ea-08d9e029fc58 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2022 17:41:58.2660 (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: DB7PR03MB3500 Subject: [FFmpeg-devel] [PATCH 04/21] avcodec/mpeg4videodec: Keep vo_type in sync between threads 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: h5dcjycjLg7w Otherwise one can get outdated values when setting FF_DEBUG_PICT_INFO. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 162048b604..33a0c97ba8 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -3471,6 +3471,7 @@ static int mpeg4_update_thread_context(AVCodecContext *dst, s->divx_build = s1->divx_build; s->xvid_build = s1->xvid_build; s->lavc_build = s1->lavc_build; + s->m.vo_type = s1->m.vo_type; s->showed_packed_warning = s1->showed_packed_warning; s->vol_control_parameters = s1->vol_control_parameters; s->cplx_estimation_trash_i = s1->cplx_estimation_trash_i;