From patchwork Sun Sep 10 12:31:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43675 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp1565143pzb; Sun, 10 Sep 2023 05:30:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGP+7p/I9fxKHkbZwTdOqPBifPLvV0LmfoOOjLcfLJvNGXtqQ+1GWtaLqXMDvuauGG765AI X-Received: by 2002:a2e:968e:0:b0:2bc:e2fb:4c8b with SMTP id q14-20020a2e968e000000b002bce2fb4c8bmr5940972lji.38.1694349014493; Sun, 10 Sep 2023 05:30: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 qu15-20020a170907110f00b00992d6e88081si5067411ejb.956.2023.09.10.05.30.13; Sun, 10 Sep 2023 05:30: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="hWUksg+/"; 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 8FA2D68C8CE; Sun, 10 Sep 2023 15:30:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2035.outbound.protection.outlook.com [40.92.89.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 127C968C196 for ; Sun, 10 Sep 2023 15:30:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AlhonxQODNvPAPuN1RCXb8p8C+lEjffWHi6K4rnbXqUnENUV46p5cb4myi4LN2FSeUCzgCdbOtHrYpohK95n/7KJANkarUnz19YE3MRqkY+L0qFIs1q7F/JHe4+Up75o+6v2TPcmfTWfjIwx66nAnQoJv/sGggAttYMcquHrM7C4ln9h0pwRIjclV39PMhTcnJ0L9GB/k1P21Cl35yiaG7MA0iwTPCis7QLos3ChOkiwg3vEk8UJXHV9d+VxXmmwp5ahhzr3m7HWA7tUkhEMyrV4vuJwzgcEg7nHMfGa+64eqlLIXVZ6F8lSlvvSUfSaKgF32KiXwIg67Ivu1FIpVQ== 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=EmRAuW+g0nfE1uwkkyYmvYcSgHJQScWlEKExlEWSvnE=; b=CvTlF5ch2/+FghewM8ZtWqn/jy1kO75uiY0FfaS/2YDHBLDcrys+z0dSGSmUqUU63jN9gNnrvaPa0TAfvra4dFCDnZSttJrfzRA6r3rFllPyFcCjXOskKGxIO3Ze0zA341YQdsMOIbMH7y6sWMTlVduXTpuNcXB1pqRaHydSnkYu297MGz4j5BRHgXBmXiXBxWjlRRM/M9f0JCvnVO1YlMjYntbbYd11na0rViY9RKMOuq4zIdNsRumVD2expOR7quWQoVC2lq5M+9y+p2ct0GaVpzOgxMnnBZAR0uIc2h+mM/tNtlxoWSPsXFzihscE7PwLqe9ZhA6kaOQ0QrQafQ== 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=EmRAuW+g0nfE1uwkkyYmvYcSgHJQScWlEKExlEWSvnE=; b=hWUksg+/Et+k1bl7ZdW3PDTVkoDLzvXoAxoB2WYuJqwPy9jzCHbqIrj3XPtx+taVveWSIs8mE9hbxT4gWJhQqF1NaeE2VyqaFBunbDO/VTcaBUklBgzqp+98cvROUsxTcc9cYH72XHFscBDaJ7kfiSL6AuuRA/Jn7eLd1/5myOBmq9944xvU8hCislDWyxLKIyF0Syt/7/q9KIoBVxTX0La8iTPUWEBOzq0vjFoFLRMNAzIEYymiqk/B5fZZQDFdT9q3zlsD5V0hFXjvbSNQG0FcqJQT9Ldwc1rNTZ8sjJujoKyYJZwl2dgE0zcysp809AIuuyyTy+mdX1FWRVSaQw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0002.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.34; Sun, 10 Sep 2023 12:30:02 +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.6768.029; Sun, 10 Sep 2023 12:30:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Sep 2023 14:31:11 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [UGYGdwKwAyw5WPyvTtZpY5g1OehuhPEN] X-ClientProxiedBy: FR0P281CA0117.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a8::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230910123113.2862655-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0002:EE_ X-MS-Office365-Filtering-Correlation-Id: 6acd8fdd-91b6-4830-e806-08dbb1f9a76e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8aW8iOjrl6p1fKZuJ6qdEUz8JGZOkrWTxLLqEwxfQnZ3MkCGBPUzYi+oQDORAZXwoj/CYM5pM5v3d8gw7JvDIUk8CtzPTwAxampIMchJ6/GlH0X/uGR7WfTpQplrAvA0nIpiye8oQxmPr81zU4b50/TiulLV/x9bn1VtfiISRi6CFwleJca1ZFHwiCFkHna3CeCLEGMSs+0+2VsNE0ncW1dXgYwKeQIA9AVZMdDm1zooFypww2dth5OT+Vt/fc45P1/w47YHgIM1NdHJkXefA+BWLMcM43Q2/2Sru734fTpAqe/CuFsOkus/SIuQkrQ4j0v3qYG96i4j1xJfE5Gb34XUtWctIuhIe+jZdIUC0CI0tBYq9XxqGh3LJ9Nbr+sLZQ1gA+shbPhaYofUda1cblv0/blBUquGSSqsf/EiKaCsI05/TjjZUMWc0/VP0wAt4ENwlx7ytw4NrQLm4qULdGomspUwIdhYUrijB/3PiL7DyEWx72cGsi58H/0t7+RcbTx+QYzziAo1CoamBeLgug3pnG1jUEsTjkrtWBpUDbCrKV0GSm7dUWR9PU5pVrT9hpVBBzH5vHq1KCOtsjfTtAvDyiAmdP5yRKPtDeS/PcMKad8xcFaLn5DsFiqGweeh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yVzWGWmIV/3sdXFNmbKM/F5W/ARgdYS3iaCFEG8Qbwncayw7JT8J+I1xG1OoTuFLY++lrgJSrW/kfBtOOGlkulLs/LxIJtK2nNaKRk5vETM/6bJRcLWlr5WFm90PKjDR55QJR1Mrm5C2imxH0dblqtHcL199Mdu8dMjNfok4nrmJZHClE5U7h7qA+xc3QOyl6k53fb2KTbz+y5vqUQXjbT+9TDR5URpkktE9z4EWbvm1w88dLS8Fai2s1K9RGsj0cOZkMvm7n4fOBlO4LWuPCAirS0ITFkcnhdNShmiDKuziwdF3zC6YPPKg9X2FC3su0unqrmQ7Q/JddwGxq0m2ZVdF7UZrWumXFVivhAxpvrkPO+slfsnpMXf2qMG+L8w3b9pS2oGbH6EuP5KgYu98IlU+sYbbJGOSMuCTcHLz4iVNupmZFeLoNBZIhk2Z4rxpcELskYEvPmLApU2jYfjNziUfmN6tgJXjkzUROytLv4+qqGu/o8wOm9SwOgMoFvrv2n8Mz5e/D5rwsJsosUxOV3U5c1CSuMqk3lss3VqkBJKPilW5C/vi2/zGpahi6SmIpQajWvDM0BWrGDwBeVFNRA9eduTgg8ucWNVZN20F0L+t8yXCXA4VRv6DVqAwpATMZkscKq7wLsgL4ZYf0Rew2xb9pJlRNnBHBammfdO5pI1IPxrP+Mp54fz5IKRt9dycsQ9PTrHBcL+cZ3qC7DA7iAuMAHKH3/OB/Osj36RyoojCQeQtdHwZ/zH/bOc3eF7jIoXYoqFdjtZHMPojRUoUqlEqWAgp1XGz3D757lai8SLxMYTPOD/NbrxUJXzUmFel6ltB5XDFyQjmyTSmM62lOV5F/4I2T9iqS/mb65FvJTp683DUq/hJhLvvqV1doEMnatvrb4r+OQDVN9HYMzj3F+j9Sl3JZp9xGlZI2D6RNI3en3pjecRRCytkKOQ0iBHvWB6oB4f06TdJ6563xItagQpvewKuB0VUFObWx3VhPc9jG4Qmt64EJ3R1VVi5//bBOSKcu84BFhoDJMxuv4n46+yTfGlZTVDfC0s1GC7kWI51yTjC10KjhGNhvPd1lse0WZdN9X2tIt7qeHLsL73x7Bf6ldyYdEfohT2E1HXQWolMcbgNFIJp5OHTvEgImorgGvF0zlxOKZ+1Xr/4G/TnPfwwMOvMompQHlLZKVtt/yqsR2PBZQtH/lF9jRKeWibwtBbE42gEZBcHS3+FurdGPU4Nzq/cdO/+NgRu1AcEgTKiQjhRtmxZqZzcwyBFr+kO X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6acd8fdd-91b6-4830-e806-08dbb1f9a76e X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2023 12:30:01.9292 (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: PR3P250MB0002 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/av1dec: Pass AVCodecContext* as logctx in get_sw_pixel_format() 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: iVt4NTmtDD1I It indicates to the reader that said function does not modify any state. Signed-off-by: Andreas Rheinhardt --- libavcodec/av1dec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 8f9c2dfefb..8f6c4f732e 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -440,7 +440,7 @@ static int get_tiles_info(AVCodecContext *avctx, const AV1RawTileGroup *tile_gro } -static enum AVPixelFormat get_sw_pixel_format(AVCodecContext *avctx, +static enum AVPixelFormat get_sw_pixel_format(void *logctx, const AV1RawSequenceHeader *seq) { uint8_t bit_depth; @@ -451,7 +451,7 @@ static enum AVPixelFormat get_sw_pixel_format(AVCodecContext *avctx, else if (seq->seq_profile <= 2) bit_depth = seq->color_config.high_bitdepth ? 10 : 8; else { - av_log(avctx, AV_LOG_ERROR, + av_log(logctx, AV_LOG_ERROR, "Unknown AV1 profile %d.\n", seq->seq_profile); return -1; } @@ -467,7 +467,7 @@ static enum AVPixelFormat get_sw_pixel_format(AVCodecContext *avctx, else if (bit_depth == 12) pix_fmt = AV_PIX_FMT_YUV444P12; else - av_log(avctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); + av_log(logctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); } else if (seq->color_config.subsampling_x == 1 && seq->color_config.subsampling_y == 0) { if (bit_depth == 8) @@ -477,7 +477,7 @@ static enum AVPixelFormat get_sw_pixel_format(AVCodecContext *avctx, else if (bit_depth == 12) pix_fmt = AV_PIX_FMT_YUV422P12; else - av_log(avctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); + av_log(logctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); } else if (seq->color_config.subsampling_x == 1 && seq->color_config.subsampling_y == 1) { if (bit_depth == 8) @@ -487,7 +487,7 @@ static enum AVPixelFormat get_sw_pixel_format(AVCodecContext *avctx, else if (bit_depth == 12) pix_fmt = AV_PIX_FMT_YUV420P12; else - av_log(avctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); + av_log(logctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); } } else { if (bit_depth == 8) @@ -497,7 +497,7 @@ static enum AVPixelFormat get_sw_pixel_format(AVCodecContext *avctx, else if (bit_depth == 12) pix_fmt = AV_PIX_FMT_GRAY12; else - av_log(avctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); + av_log(logctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); } return pix_fmt; From patchwork Sun Sep 10 12:53:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43676 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp1573005pzb; Sun, 10 Sep 2023 05:52:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH54O2cJHG4FfHljgvpfxHH7OjNCfh+aLuqfAesWZhky+JkWfVS7Fvapm9aMC3Ojt+SAA5K X-Received: by 2002:a2e:2413:0:b0:2bc:b9c7:7ba8 with SMTP id k19-20020a2e2413000000b002bcb9c77ba8mr5880315ljk.43.1694350350544; Sun, 10 Sep 2023 05:52:30 -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 q6-20020a170906940600b0098e15543465si4417719ejx.280.2023.09.10.05.52.29; Sun, 10 Sep 2023 05:52:30 -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=m335PiBO; 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 7D9AA68C279; Sun, 10 Sep 2023 15:52:26 +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-vi1eur04olkn2055.outbound.protection.outlook.com [40.92.75.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D759968C279 for ; Sun, 10 Sep 2023 15:52:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SrSmr5rOaIDqc6P34nhROqPZ2jIQ6pyiZax9DeW05H6iMwE/tPwMrdLtH6ZsWzssdL1WYoGyxNEWvTh+gBne7SNNZOecf4N4CDR1Vya94NRuJcEq+osR+UNyUGGjVsX7eues9KiJvM0ZbX5YqDukbk5mdTfSmvpK4/I8VWAxtknAjG6J3lAt3erABW8qxPILMRiQ30EYZeXNyalXNcG0D5gnFY2LYWw7ZSJWCAaocBuo8ZgZZGLyTfvxAM6qrcWF9chJeWpv0Lz4cGo1zTReCJQ+RqX5ZYHnT4QQTF6bbOFN9eia0v4xkUUh1cMVvtSQ52ZynxGADPjdnua2i3Ecuw== 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=i6aoOMH1AptrT0lOKMeUV59U34FG6qvzwdEHQAyCmk0=; b=UDdmx5W5HoPkYXMihHbrJMHiqOkSxBMASttN/W2I4PIcneckJsIVCshHPHUCOrrR75tMeUPIowwDWwp/Lc+qrdoSYBYnuKRpwQJydsgQfFlJkOp3SLvCOuoeaIwD9+JpMcb8RaU4LYFZtfsbAAuPmwZLw3g7tg/kVfDsFkcKQSANVUiTfna7j8N2B2KqmVb47lO3zJD0cekAbcs45O1jUs2kZDunDU+AZFPfG4P3LoSZoHXCLZXW8JWesXNlODU+PZ4tR6qPIh8amy7nbYMeC1WO5tDQgH/QBksaxSUtV5JE1V227tFVnbF6WmC1N4e2N0W+yfx6A9RR3U800fQ9NQ== 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=i6aoOMH1AptrT0lOKMeUV59U34FG6qvzwdEHQAyCmk0=; b=m335PiBOla6Exc2egzEtG8nmzO+mzOKX5ElXdFjpIi3et1w0NSDOYK70reG86tC46sjO8jW3yhqstGk15m36Ex0hbacH+iz8z9W7OI9YTicsxLNmlXzGbrU0NJCoNBlru6F+rxAyeHeYnh77FQXLeGmOBxS4ZlOsD2lHySag3J4x0cAKJsTNx2XEbYUTqRvHAyp04NiRc3wo4UHXpaCG3Ta30Yghr1kp4k9bFMb1WLGlrLXTlRmoxcl6gFDK6PCFjXYezQfd3uIn0E6cJ31PL/M67DfV88zaEfvO41bbTCegFiAE9Y5e0kiyhhDq6rj7wroXd1N19Pj/3N5LxB29YA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0229.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:324::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.33; Sun, 10 Sep 2023 12:52:18 +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.6768.029; Sun, 10 Sep 2023 12:52:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Sep 2023 14:53:30 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ig1W7aP2Y4pYQGG3RM4MSmFfvUoa5X3z] X-ClientProxiedBy: FR3P281CA0024.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230910125331.2863957-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0229:EE_ X-MS-Office365-Filtering-Correlation-Id: 0f420ebd-9329-4948-47dd-08dbb1fcc3dd X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uLAsqMUqwCOp3T6lr74drQlGFKiDRo4USZoMB5wC2OgJBykjPbzyhqXe0TqGfseS4LNlyn6Z5cJtWk35/DC+hGTneG+IbEhNV5bZTKbvHhI7sl4NWiB3B3xd8mcVGNdbL4nZjXeU2yXvfzvDO+tBJqqwBn984P/wfX9SHVFSG2TSaaWFOAs90GouWVZLFp9oyeeE57AJd8jcdyb2WVadFf0bca4eZpzikrC8k5ftamGNFCOfHsneDLoI9g/O57SMuvGqNPGRhOnuMJu1udtb70a7HSPrFq7hxuFxD1uX7dJbQq8sCyzVv9pTGd/NpaWQ3hc6wfDqS6zUPTqNeeLm7qncOcYQCESBeAPSssXVzbz1Fv1SVEANtBJ7e7flTRH22oml7kEgJ91ZBNAfklq/Tpb2eSX0Vvnxa8G6DDEXgGHfgZzmQURAyekE+JJOm8QEavjYeyvJrM74jiuu5Vg1pyN3X/Dh9r745m087vDkkQymBd7MTyF2GjYWdfh7Ej6QXTRpoeWykfDdTn9oM4f17Va9Wi8pSH7uROZlkfe9UzrgO6V/t+RTsTHubv+tJn/u51kPNtFeyqxeFewee9f3HW0iZKHo/Pl2l7+JQ0bLdJA= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lYQwBXptXI0ndbnOsCFhWC0oUApcgAqWRn8Uhhun81Qi8Q4EUZbAuczNMV4zt70rRS/ArwnyQtvUQsTrstdjkCUn1dkn6D/pfr3EyxgDuamj1V4WKn9O7yHdHyAWsIufzy/GDUoMBALHBswvZcnLT/w5trKUqJfJjZ5g822mxkzXNFWiATqTx4x3GAia758dOjxuS5ba92kgBLeqaOozZj8mu3xtMY0+tjyQUVeScafXzY8Yyf9AVZ/MTR2cb0fzFwJ3gyDxNUBv1usu7Hh5JZPwI43GEqeG0grxcL6SnFhn+dI171GXOP+k29Rm0hP21rKkfa0wHoOjTh4bBSh2S4bAz9SLT4GetU8u9aTbs4rUi0F6nyhBw7I9kFZ1p6ilF5Wp+eO/2Nh77J0ojhAXh1rhzurTXCj6Wvu2kMigo+Tb4dmpWaXJebUUzSVUcQD9wcf1Ift09JrVkZchfPE2CtLkbq91cqLdJRwTl6WfHVKWIhOkNyl6RKCmxql2Jck2UvJ6jIByCiDB3tAwLS5xHT35xMMfckaVPpzL2LhV5G7Q6roEABS8g7a507vE5yQeJ4PBLiBZjIrNyI4XvdTLvvWE8NeEesZVDVtkoWnC7lP1CyHYbRw/tYnyBq5jW7SWSTCoK5L3M7fVGElNdrEcv0beh/4e4fT/+u3NAXYK9BO2o5QPDJHbsUhtPpS6F2EIxJGgNJQhO7Obr64Q/F9B7AtBzBKn8wfoMsClQjEPZGTZGyqcnrjRv+nQbU3pZlnAWdnGA+i1ZahmK+vn8gr67IGWhWic36QctyEGkzZ0+s/nKTQHtQMc6oodBlJ7banEo8bQgf4ukZZou6mVAkgwI37kzx1jUPcOJupaVdMjQUOWMyHNmjcTo+T7RllO3Wi4lAOsJGGDgqZx6H7Tq0u9jgvYnX1dh9M7QRqmRW8tIxmbtUJaLKa2jPDQFhFiLbw/3s9I3kfv8NypmegMzKYYd7mb82rsjGwOaVZNY7qpQqZ1smJgx9ttB+BNucgFLcI0SlmavZnZfAkzBd2ov+nZfZpKYFdKUT1hzIKiGXFYO9BgzRgoV/KIsJsMa9Vki0VYDn2uE4YwZoQ0xTL3MGZdcz8m41ATbe5z1e+M6bF1twdkfE0VnpMZMcnMDv+UtFaiT3k6iFCeXX+sJRqqQsv91e91+422SW6WlyIQLHEwIpDQdW26uqgW3QetTj8z9ATTyFoETLv9beVAeuRDgIDgbuz6naV5R5q1GbFPzFqLKoctm+lcOtmjaaGv/RufICQj X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f420ebd-9329-4948-47dd-08dbb1fcc3dd X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2023 12:52:18.1541 (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: AM8P250MB0229 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/av1dec: Don't rely on AV_PIX_FMT_NONE == -1 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: jFe0s7lOIVYn Since fb548fba04193a418f118d21b261ba05db4f480b, this return -1 is in a function returning enum AVPixelFormat whose caller checks for AV_PIX_FMT_NONE for failure. Signed-off-by: Andreas Rheinhardt --- libavcodec/av1dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 8f6c4f732e..c523c457ec 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -453,7 +453,7 @@ static enum AVPixelFormat get_sw_pixel_format(void *logctx, else { av_log(logctx, AV_LOG_ERROR, "Unknown AV1 profile %d.\n", seq->seq_profile); - return -1; + return AV_PIX_FMT_NONE; } if (!seq->color_config.mono_chrome) { From patchwork Sun Sep 10 12:53:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43677 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp1573654pzb; Sun, 10 Sep 2023 05:54:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGZhA/6fOK7H9ETtbhvqVLDLiJc+jWm/Ve4OwpQM8ohH/jZer6jynDkxJOGcAlaW1zMV0aq X-Received: by 2002:aa7:c503:0:b0:52a:841:bc59 with SMTP id o3-20020aa7c503000000b0052a0841bc59mr5538674edq.2.1694350472227; Sun, 10 Sep 2023 05:54:32 -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 r5-20020aa7d145000000b0052a3cffeeecsi5069138edo.599.2023.09.10.05.54.31; Sun, 10 Sep 2023 05:54:32 -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=beiFoFwC; 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 B0B4868C841; Sun, 10 Sep 2023 15:54:29 +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-vi1eur04olkn2047.outbound.protection.outlook.com [40.92.75.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49EB768C7D3 for ; Sun, 10 Sep 2023 15:54:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gpFn36c9gyP4vWHrdd1Kn5BOUgl4kwz0raLtsbB6Sfnd5gaPZu6xgke7i1ag49VPekTn5TGkv9xobPT2KxGBm8Q6cC8ct7dxmooDDuyPm/dtOZZ9qAHK8F9QGYkGXQb79PfLL6L68U90LzaEDVVwxyaBr6b5TPUPvknRxHHFajLvYQuWyz7Trqi3Kx9pcnmDup8oMMdH5iSCfPzr+dhGWlhTBJ+Sa/SuBj3Ehg5r57ygP7xAUd15Q2OVgKx8BpL7AOs1yY6HPbcN9TPoGojrSSiW/7s/LX+eN97K/Vd5dgie7lSO9i1PIpYiFi89kKwS5Y+00kjmEbaR1BvX9SxPjw== 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=mvh2UIJZAD8AapBL58vnJtS95s2TyYMzhsllsBjrBRI=; b=hsupg7KIIIQ8Br1ETVv8qhpoLaVh2ns/rQC17CyJyGJe3bbrWDWTuXQDjCB1rmZC0WSKDGwlvm6PU8u0H0q3aY4g8Mo14QW3yt1a+oulRLZhS7vN0c6IMkSqX99Ssuo/DiA4C8tMvuN1bWAil/WKdoeSWo130ri5bX1Ry2LyKPYETBQiZOALl3Bjy1cYRg3NvN9mg9we8Nwten4AzRCQkt/qhRh8NI1sEQFVVjFUcZWtq03F4jlm+V5Tt0OFHSDjLFK+WJVkSOFHLJXfyx6pzme/lzur+ru183rjxFOw64rBkX9nLDj6y4HbC1k00BHvrw5AIy5aiZbAqnqmLN48mQ== 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=mvh2UIJZAD8AapBL58vnJtS95s2TyYMzhsllsBjrBRI=; b=beiFoFwCc2FoZENFKK9/kD/hfefkAVTD08s8YpYqrRhuSYCjhwk7VSuVGMlSNrAtf1WD7O8DFe+rUQKmU7rKmCtYHSjPhaUmvue/Dyyy/MXnv792WTt89C7TnaslJMylnXjoTG5Wfrexs5AnOquB+zs8Sybg5i6C/ZpUDYrpn+QYny/Osj9hoeeWnzVDkP/+5iUqD90YLc5tMN0nbby3dSXIh/DJbhJAgEorgRX13CjC/4MWAN2cHKm1juwNfRtGduZ2i9st0KdfcQks1/1jJfC6LynfgMnBlnHiTR9I7kcIIYFZEauMK1/AO/yR4+HvO0N8YDoQPXkik40g7wUbyA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0229.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:324::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.33; Sun, 10 Sep 2023 12:54:22 +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.6768.029; Sun, 10 Sep 2023 12:54:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Sep 2023 14:53:31 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [dxOKmav4nwpRcSfGW73ZQvQoDljGJeVJ] X-ClientProxiedBy: FR3P281CA0024.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230910125331.2863957-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0229:EE_ X-MS-Office365-Filtering-Correlation-Id: 79dad66b-27e4-4cf8-0da8-08dbb1fd0dc5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NspQiBc9jKwUx/LCnQ9qI58y5jDH+2bsEIxXIT6NsReyDB1b08pPG70qaPlkU9bU+Mtw3ew915mhhXD7iuAfvS5G6lL6X68Hi1U/gwuJ2Kr44GUC9KxKgwf2xbzvee+jdCDzT8M/ETOfnyTy1r6ygayhLCFxZOc9evSQufH62T+MoHN47BwAYWII1bAwABiV8gtvSepEJfdAZeypAXCn8UOtEgk5e1JNqesuxDx5p22+2vrw0C1wkikIuwDw1yOusONtiB7Dn0tVOkQYdte2rtOFAsp+ijL8AZ7t2hOFZl8MeLn2TdAA+8UBB3qLtcTuYOLz6InXupGAaXXSq4RqZLF6N7olL+hLkHYWeBcnlFlVk9sPsjXmDw8fOyHNl3ySBHVaF6hKX6UJOSS3pNlH9lRZ19Y8MtJ2xOzm9e/eoolR50rd7CUad96//MPv/i8FiTRRgQBJDS7ZmAVx+07ImFHi0kfFXD7Ejbt+M89sn1UWn94lmVpQngdpW1eR5kK3Tm0sHCcPJ/nlbEbyoJ5xRtK90QMWsx+ksVO9jF4oXP5Iw58tjMeUHtoq7gvWSMCwZ5c3g5vXDzPbQiSA+AokQRKKOYidRU1iMEVVDxi+GFv0y9d2ZVEVADV5alospF0B X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: urGxdJK6SqkzDarco42yQigJZ32u9vP0ofLgPtQU6Jx58fRUrbhaEUEbQR+zwWmfDw5Z1RtuwViYdRFLga96Puowmzs2/AEYLUmG/RkbjXDZKSwYPFerW93fASbQZ0qpqswqXkLyUZeVIQkm+nwDA3qlvkOPe8+xQUN3PSN0FPvooDdlF+fOdcMTxejphDZ4f1gUTKgPs6km4wwFlKoBny+MLhckRIPB5vc9f/k/cnvoVBxTZwwOYdqQM7b+ZAPXZjfbiBRbyJXTOPe+bCf86bTSq4/oMrwoVkG6XupuYxzYryyKA+guok3WXsivPTKs2zpK9wSJHfK5f1N/9w1lINxCCUZbbP8efrzHFua8o5xiz5ir3cT4dRbAzMf5GNyGLq3CJ6jVK37Youi3ZvyM1gjZFSmbdnaN8IKw6L2k24+H+zjRF0jCUdKCCDsCbnAJpI1gW2fnV8imowA5dVaMU0WUa3EUTdVc4pH8Y4Qb1sBLthNrpEl/oxTCcAli+XpAK+R5N0ruBKnK0jnkbwA14kSP6yMa4U8jhHuhwUvqrEw6BqW97cs4fRKCrRMd7h8WBLHLpCX5rd0tuxlGbq4fwaCfrF9TLMRhU3aj0td6xjfFEo6K/k4oqNIVfzroZSJiedUVLAJE4BQRlPRHKX34+cL0vBarXDEQLYeaer149mRKMBoRJVXm28umdFnCCzJI7BsgJVtLWHGGW4wahsofyAMZW1MKAZl+Goe4LFvAPTDaSG42k+cXjOFhxKUO2t7PtsSysO3FDNyshZyD5FCzc06PSE4TGmgdKiTM/AkPEuvoP0Q1u8TAY7PWzj5ZZkH7W6grEPer8U5yWwQQK35jxgflLPsLSCKKIaER2b4l9MO/0nzjKJSrKQvKMnUFyseTdpLxs4q7HDqB6GSgsOCwTPKxt42zeYQpjQ0iBJ8t6VOuCI+N0RyYp6wq5S2R6YNo6dKtZMrhqROK83fK01CZ9rA68Hoss/qXQdkH21woa9qsrU35ZEJL2dmj4lfkqbyh7mo7kTIsdN22ufPDXmIsXWf2A7FUia82YaK1MRIIzYtAMjoviUEMtV7Yy03+GKH1veeq0owYbBKRJ0omWvToZXYEAVrJTCbuNS+QkZLV5/GdSdf4t0iE1nVctykDt/uUCrlIHcoXJ5HtlJ+JEzYZ4N6LAMZTtRK0bK2Tp3at2BKzRRWhFkyL0g3ptCyKdcITbIbvYTRlSaLHR757HnoOp6vmtgc1aUGfDv+/9bd4kLCRjeRd3PudrCdltWZytunn X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79dad66b-27e4-4cf8-0da8-08dbb1fd0dc5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2023 12:54:22.1251 (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: AM8P250MB0229 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/thread: Remove ff_thread_get_format define 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: iRt9/o6ypfX5 Unnecessary since FF_API_THREAD_SAFE_CALLBACKS is no more. Signed-off-by: Andreas Rheinhardt --- libavcodec/av1dec.c | 2 +- libavcodec/h264_slice.c | 2 +- libavcodec/hevcdec.c | 2 +- libavcodec/mpeg12dec.c | 2 +- libavcodec/proresdec2.c | 2 +- libavcodec/thread.h | 2 -- libavcodec/vp9.c | 2 +- 7 files changed, 6 insertions(+), 8 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index c523c457ec..39ccad5bf6 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -613,7 +613,7 @@ static int get_pixel_format(AVCodecContext *avctx) *fmtp++ = pix_fmt; *fmtp = AV_PIX_FMT_NONE; - ret = ff_thread_get_format(avctx, pix_fmts); + ret = ff_get_format(avctx, pix_fmts); /** * check if the HW accel is inited correctly. If not, return un-implemented. diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 6cd7bb8fe7..f3af345c99 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -922,7 +922,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) for (int i = 0; pix_fmts[i] != AV_PIX_FMT_NONE; i++) if (pix_fmts[i] == h->avctx->pix_fmt && !force_callback) return pix_fmts[i]; - return ff_thread_get_format(h->avctx, pix_fmts); + return ff_get_format(h->avctx, pix_fmts); } /* export coded and cropped frame dimensions to AVCodecContext */ diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index ad22d0a30c..81b9c5e089 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -521,7 +521,7 @@ static enum AVPixelFormat get_format(HEVCContext *s, const HEVCSPS *sps) *fmt++ = sps->pix_fmt; *fmt = AV_PIX_FMT_NONE; - return ff_thread_get_format(s->avctx, pix_fmts); + return ff_get_format(s->avctx, pix_fmts); } static int set_sps(HEVCContext *s, const HEVCSPS *sps, diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 1accd07e9e..677360f954 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1168,7 +1168,7 @@ static enum AVPixelFormat mpeg_get_pixelformat(AVCodecContext *avctx) else pix_fmts = mpeg12_pixfmt_list_444; - return ff_thread_get_format(avctx, pix_fmts); + return ff_get_format(avctx, pix_fmts); } /* Call this function when we know all parameters. diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index 9297860946..def58b2604 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -278,7 +278,7 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf, *fmtp++ = ctx->pix_fmt; *fmtp = AV_PIX_FMT_NONE; - if ((ret = ff_thread_get_format(avctx, pix_fmts)) < 0) + if ((ret = ff_get_format(avctx, pix_fmts)) < 0) return ret; avctx->pix_fmt = ret; diff --git a/libavcodec/thread.h b/libavcodec/thread.h index 88a14cfeb1..2c8c0cdb16 100644 --- a/libavcodec/thread.h +++ b/libavcodec/thread.h @@ -62,8 +62,6 @@ int ff_thread_decode_frame(AVCodecContext *avctx, AVFrame *picture, */ void ff_thread_finish_setup(AVCodecContext *avctx); -#define ff_thread_get_format ff_get_format - /** * Wrapper around get_buffer() for frame-multithreaded codecs. * Call this function instead of ff_get_buffer(f). diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 89f7549ef0..3cc27aa812 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -250,7 +250,7 @@ static int update_size(AVCodecContext *avctx, int w, int h) *fmtp++ = s->pix_fmt; *fmtp = AV_PIX_FMT_NONE; - ret = ff_thread_get_format(avctx, pix_fmts); + ret = ff_get_format(avctx, pix_fmts); if (ret < 0) return ret;