From patchwork Wed Aug 10 12:25:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37208 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp865277pzi; Wed, 10 Aug 2022 05:26:10 -0700 (PDT) X-Google-Smtp-Source: AA6agR7sO67eGieoH2hSVp2Yl0M8t9XPSW16UPmiVRoCLSPvEStDl79dip+ifEtL9eDkSu2jyBPh X-Received: by 2002:a17:907:763c:b0:730:c378:b860 with SMTP id jy28-20020a170907763c00b00730c378b860mr19465963ejc.97.1660134370487; Wed, 10 Aug 2022 05:26:10 -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 cs9-20020a170906dc8900b007317ad1f9a4si4814828ejc.310.2022.08.10.05.26.09; Wed, 10 Aug 2022 05:26:10 -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=lHw73E6N; 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 88C0068B735; Wed, 10 Aug 2022 15:26:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068062.outbound.protection.outlook.com [40.92.68.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D350368B735 for ; Wed, 10 Aug 2022 15:25:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JDcVcJTwWbJ7r7T9fPnT+6CNvxMb6ZzgJ2vzVgRcjeL61eza4pDNG5udTGIcBMxIQ9VMiE9GpuBEfycM9CERWN+p10HKnoufTwiv9mm6WDlxAqfCBTdaNS1TOYIU8n3n8Eli8fTSaXTDuGT/dejnEbFy0GoKBAhbz2eA1CkvpiY3aP5AD3LWlErcmhJhWXJbQLv+7NXSLSosSFb/aNKRvVnrozuGjyhblg59bAPzScqbzHRkx3135xGR9fehZ44VlQkzTh33NBnJVXVazUdGylWG11xSs2PJgSmOSW0mg6xbRvEfLE0lMpemgwT2akfrSO+OPAOFKryBVJQ7silHKw== 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=dJ7TikH0PnJUIqNyeomVh15QQ9KCm+wBiXwadOAMeQA=; b=Y2vqXrnzHzOautT4oyYkJE8RDw0o4JOKkBkd6Afi4EXu2WN0jL7fm7YgFPmAMTnfRdfZwixe7NfzPNx38T7t7NDI8QfT2GLK9Yk/IvYKsyfBqOKPRNXa0UnGicUcrvjUctK6UIHbObfseBNQHqKcN7lFZogsSGgdeWEF4z9p9Wzeb0bS2B8oM8vMxYEctEIL9cx3+SRLvqtsIuuBxZl5tbMHhzOVcHk0ebJT/8QN/RWO6bCIp8aMZWzA60I3PxnHTN+RNCqVO7g+nYp+IWUmzfI1krpZ2dmHgAJfBKV4CJUM0VE+8CWVHwcW/mcSygpCdiBiIZ1B1t7NcAMlD+vWWQ== 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=dJ7TikH0PnJUIqNyeomVh15QQ9KCm+wBiXwadOAMeQA=; b=lHw73E6NwvJOueQl4Z6+t6DU6WEpjCeYzXkyTEvxZEOqnp7q7P84yQKw1RJ7npSJyV4BKE9XzVsKxlArLsB2ZpeFI9QNqbMHNBxpQ8C3X1Oo08izHKquA1yXxnUijVL5ygfu02Cv5Q9GV58bh3/Zttrdu9TtakwGaqC+uj3l4LOVCsLrOVEVqkDbS5C0LimMWKiMx2Qumz2zj3BgNFrpWum1ZrntYPew7W7fy/2t2j05uZK72ff1MPn/UjpyO/wS1Mo4EWmtrhceNy9KM7GJr+Z5IPVoZoSAdCIdV3fDlnPfM9QOoz7KK0gzLprzj+vm7+1yVF08cDeyxakZn0lhUA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB9PR01MB9223.eurprd01.prod.exchangelabs.com (2603:10a6:10:365::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.11; Wed, 10 Aug 2022 12:25:57 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.020; Wed, 10 Aug 2022 12:25:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 10 Aug 2022 14:25:49 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [rGCWZKiuYUfjRn1GF/Hzf8gjSg0kCJhX] X-ClientProxiedBy: ZR0P278CA0148.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::23) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220810122549.767705-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8e7f60d2-0b94-4dd2-0635-08da7acb79ea X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRXtZoZrmtOG9c8UU+asqxFlDVImaCvdhY3BhvXl6AmlaJ41ffg24meVlSWmNoS1PSTZuRR09OKivBVPwtWn9CRAhLyfa7zbdMNipdCrWuemuRrc8/MfvLOgyppNyV6yHQODPsNj+VihT+I8bEf7gbqBwTxYbSlSL3LR7Ayo1iZgFfTxgZ1sDB9ewgtNeung/MG+wkTR32IG5viYDk+plQM13ha8ortTESEUgJs8etYpbZzPJiWWlSqhNlT1DJQ8SClWlsSvUopH7vgIOcYrn7+49aGH8I3keI4IfpJUUrKjFhSlEYEeXDCXVY0Y1fOakPJIJ2wHJ8o4sggq7vJ1hsL6YhDQZ5CPotwQMttLOJyidBYk116C1LOcWkdF5Vw+rhdacdD19LwRNYs1XOANApgm5QEjBZCxW2VQWiOdG/8Alwq6OcAQrsuI1QFPKROe/WLA3aKv0P3lRNckh7YyQGL4Iu93XiZ4M1Z+/N0L12RnIK1jpZCGDQ/qM/uUBTEhROkA6WKbI3axa5Fl7ON1HD720MKZQwDwy66lMwTyoomFMrSS2oxq4F+SmE6hlDIkNX5hGdEvJn+Q6GmKWO2CEgbFfBsI6APs0rC1q4Aw/mq8sXzM0gdPzJjizSJn0g6zBpBTZO0BWOrKWQH92Z/k+Q+V9zVIhtncL3oE5AmDxkuR9HVyxqqhCgd4YQibuBg5PcSBEW1Yvp6OrV1v0WaaP+1yI0CxYjNQy5a7/32jpLkZnvzMknoxGKIJ1BynB8nmCQ= X-MS-TrafficTypeDiagnostic: DB9PR01MB9223:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mSS0H2pIRmQl/hQqDtrrmSzfyJFUCcFnokKWDNFszCUKArir6oadH1gHKKDGFyY11kFr6Qun6A/2NEkmr/RH69KYQ1x+x0FiM1kn6RnQbOoKr3v24EKRszwAs+2MLKqbzi5Vuo0ZapfrBH5E9DNZ6coi/D4NXOv3QUO5aGZPAoVau2m44F89Eh1Jc2yhTqOH+eDurZt41dkU6d3qDXgyoKH7b2t+i8QvabcFRIfalGKOXDIxR95FMgPi6MiMAMEiuFGGhsEe7CNMj5E/5fPSu+9s89Sm1lUOYO1IkspZ2RBC6agq+LRTbbAPcTc5M+oU2FmReF/tL+rdyMDZnnacM0i+UQHdlsqDV4uFut/6iCwrjF3MtiEc8PLZG9251GmbZtTYBucqbZ3Gaidw/7znPKdKieSyZ38H7FcYnx8xfYfFDXpCJdm8RpVnn3WMDnYJRsuxJ1NkuTW3Anq/v6WN74Qr/N1/F3euwTIRwxoQbZJZwiqv93wSqsTy93UFpzxRAGdMhW5NpCK3LeuLJHpu1ru+bjG+/qUKt75D6nU+CVGsF0y0WYP5W2r81hSy8OOQgvyw856AEeRdpMY7ttnu7TWQfUYPhR/WrHzy7IYbTpqgne3zEhQI4sJNZABFnXAFj4e2zEC0s73uSXV3dPDYCw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Lnux2DvOossY/dnkMGOIP+duxBaWFEprA0nIpKAIJhHsANVtLbVp85c8VT9JQ17+FjB+QYFY8CXOqyElnzhdcFOzd2kkKfFlz++h0twByx/S8ghT8m4C7g0Yhes4ArpKDoPAylUURrdgKVjEtpPpjE2DDu/+zhJzzqrQW7VSa9Zx5y9qjSJqkjHTOBpGqpXPDR4eUsPY3x4KUwB24DCLkyiBrcZ6NhZy/dBY+IvPrh0+kjQRVipscPI1VFlhaKIeaaijxfvb0TvbKNSLi/QlAnZKjozR47Z3ksGbJrguSzvZsYDKfZlu0/8/03FPv77VL5nwAf1yxL6BJxCVNYpgaPGSlUB6LpC7zdV6+o9uuUE7ZVSif25j7F44rxjSwgSegA6vDlB1Ye0b7wGlJ/r9Lkgiwx2EPT/dEF8s3c8EX2deC3QMbfMnzMBDl9S59bZqB3xvNnVTAG4aL4WxiPr7Lru7jVJ7nU3zlgXSaviarZaw+24aot0wkozO1ZIik4Jv0qV5ouN13y/B3qZZZmb/QFx70YoGxl8SLo3W8wFYKdkI52KY96W+IsaudLSADYHtlzp2W7PPsbuEQBfCxU4ae00H5WsBL6osgF7aidca0RD+3xMywl4eY+laOkKhEH1a9TVHxgmarSNMw26AM68c6LLKBiwa71RxTI9O16wW13kBwwLe+WBxbstxOilmB2hrB0RpN6s47hXNSBd/yuZ86gGqizJ9LX/OawuVI5BuJIb9RXN/RV5fxm0025xpJQV6YHmGquh7Z+dhpBZpoXX0EeBigDzv4wSSkMAjg6Egc1K+0l5PGQcZXm9Bp0z8vIYbYCRuVwA/gqOBvbwW2RlOnYwcl9rV3hr2H4ttCH9tStiAoGfWs4T2R2c/Ul9lur1huR7FoCnMfGKXK462P8khF9RAottJCd2npNZ1pj0HkN8Qq5j2xVMD+TYwvz9KeovlQOITWeLg/VvqT6paRUYdXy2Of8I67nmugGbAgZfW1L5BmrebE9Z5o5wjA9QLgp3OQPQnGIPk5CYrAsFJ2deg2Wd3G2VWAeKVG+nAyq8C6+dUldizhrwBuawmj2U7ndzX2sY1ge4clxJj2giZ1HmL2H7kMfivrtCDeuTMiOYvvf1SK/5xV2+QkgJdDm+JTy+tYj52oiPZq5T+JQiW5PTtKISybYTYhfkdoaPIYK9g4mOPHpvZYojjW/PUTe+MMWYuR1WAYDe0+ExSiuoiAUe1GpvHl7XEqJpsFTfmUD9CgoaNZbCDXgqWtUmYkVwNIo8gao7VqQ4ICLiXeecLwJhY89lK9W8dI/LtVzs902u480o= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e7f60d2-0b94-4dd2-0635-08da7acb79ea X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2022 12:25:57.2894 (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: DB9PR01MB9223 Subject: [FFmpeg-devel] [PATCH] avcodec/pthread_frame: Fix compiling with thread-unsafe-callbacks disabled 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: eoyQ+mqUUwyW Forgotten in 02220b88fc38ef9dd4f2d519f5d3e4151258b60c. Signed-off-by: Andreas Rheinhardt --- Sorry. Will apply this soon. libavcodec/pthread_frame.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index a54d16fee4..726bd1bcc7 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -970,7 +970,7 @@ FF_ENABLE_DEPRECATION_WARNINGS pthread_mutex_lock(&p->parent->buffer_mutex); #if !FF_API_THREAD_SAFE_CALLBACKS - err = ff_get_buffer(avctx, f->f, flags); + err = ff_get_buffer(avctx, f, flags); #else FF_DISABLE_DEPRECATION_WARNINGS if (THREAD_SAFE_CALLBACKS(avctx)) { @@ -1091,7 +1091,7 @@ FF_ENABLE_DEPRECATION_WARNINGS av_log(avctx, AV_LOG_DEBUG, "thread_release_buffer called on pic %p\n", f); #if !FF_API_THREAD_SAFE_CALLBACKS - av_frame_unref(f->f); + av_frame_unref(f); #else // when the frame buffers are not allocated, just reset it to clean state if (can_direct_free || !f->buf[0]) {