From patchwork Mon Jan 24 14:46:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33778 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:e71a:0:0:0:0:0 with SMTP id b26csp387791ioh; Mon, 24 Jan 2022 06:49:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJyNUN3q2uiC2jipnV2uLos2HAswWKAb/uaQXPJDyB6sqxhS1YeFfCFaacc6iSzxR1WdhABz X-Received: by 2002:a17:907:d24:: with SMTP id gn36mr12519924ejc.324.1643035758934; Mon, 24 Jan 2022 06:49:18 -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 dn15si6467644ejc.117.2022.01.24.06.49.18; Mon, 24 Jan 2022 06:49:18 -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=k+UAnvvN; 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 890EB68B118; Mon, 24 Jan 2022 16:47:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2041.outbound.protection.outlook.com [40.92.90.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F33968B10A for ; Mon, 24 Jan 2022 16:47:50 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fIzXP2pV6oToWuzmsXVvXynYo9ADY3/WTI+4j2kZvKzNBaZsm45vu4BBIhTs5U3NOXhidDGitE3w/1Hz8MTR04RKesjKrvqI1b8Zd/xkcls7N2owjBLCdo9gM33GzCzcshFukV46fXPhONAWmPO60RccGjrtHQ0xB8a7aDFys2L8l1u/U33xHw5oIKsz3J/ZhItSMwylTcpStpakUx5rzEOWELthMfZclFz4pcYtPmXQPgE5elaH8ci5HJF7UxU0u2H31xU6MQvSeieQeMdeIFRLxcOr/8fLJMfYq8dXi1qtIthwGwCpGEdaLPAHC9BDvpn6wmhWirLnVy7AoE0lwg== 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=J1Teron+0OEBp3MpBChL877s7tOWEXwuZw9trrhOW/4=; b=J2b+Xnsgepxlo+Itgjc1Wt/wuJ/gS/bdr7IIwFXJvajWFXR+D9eKs/GBuMDILlCvvQu/WpAvoSSuzGvcxAk0eABBEAhMBvTtymLliuQvBz+J9PqO5WNd5lMA9plpliqK+n/GuQFnGoWrMvO5s/Dd2xpXQKEZG0d5yH+96WOeELXJXBHKWrNedUNQU0CtNBXgr2/ri8i82DVgZhZtJv4uo5Rezbrc0sEyFSyws/kXlB1K9ktEuV7CUsLc/SIM/m8SC7rcVh67XAMhE/qtlkoskIcYazR+uN2SptgefMStT41dXCq31tRQ51SPpZcjVESSEKh9We4l8TjoC4U3QalSig== 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=J1Teron+0OEBp3MpBChL877s7tOWEXwuZw9trrhOW/4=; b=k+UAnvvNCQD62sn/auIJJ39WHiGCIj+d65IJMtvb20OI0kh+AAlYIcJcMZiLILM1UMGzzUB+1A8cZeO7RH+TDbc2Tki7WYyDkpHsS0+Raa0piNihtRyW999PgSBW35fW3GL+CBSebxIpgJeHgt30s0UTnJVT94XzfAfEXXEYcXO/5IV+t3Jm0Bw247rp0TZVdwH8I80XuhvtAKHMa+BT5VD+r0I7O0Y8iMwl/L1Ezx57Jfhb2iNOuNOd2eQUMzVYDT1bC/h+BM6Au4do5cGdQvlS9t7gHA8kVvhkrvBzK1WtNZj8vlIpt1l/Lyfghc/u6+h9KdqZBF3Gh1JhWQvi1Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB3088.eurprd03.prod.outlook.com (2603:10a6:802:2f::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Mon, 24 Jan 2022 14:47:49 +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.4909.017; Mon, 24 Jan 2022 14:47:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 15:46:01 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [ru5M/AQE0m9XZ0kO6dnQ+H3YVo/MrHBx] X-ClientProxiedBy: AM5PR0201CA0016.eurprd02.prod.outlook.com (2603:10a6:203:3d::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220124144616.559446-16-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 16e3455d-3e10-4e9b-a723-08d9df487dbb X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRuJzjo+afAgBd4SR5uzlp8BcsIBA7LRQ/MJy84Rl55v8uadO5lUL9ITQ+PimjeSxEQQzvZb73ZTac0BqGL13soU/6HIpR+i4/DWgF8Z3zGgbUXcFovqcNxYAY5WjCMRfTt4PtyEdBS51OnMkRYEDfAdh0Xy0cDER7I584QJ9hgNP89ueRK3HFvgcG7hbyVdL8G5GmOM7EjZ3lZXahrz0JBpU99KNAAs1YvtfyxCRrCDoi8OVe67IbG+KWRm1XXvWaS/KjWgQ1RF0nb1LiI4cfrPrrELvIn6wM2SAEBua8ZGeP4M3AxDToGotUEo1/CXQXIU684SpaETDg/hPOxHjW0Z7U0LH8xcpHKkvxWrsXBta5egYLF5ZfGfDAm/vkPiyu0PiDmkOLfJEHMl4YqbIFDPX1YvrqqxibNW7YY/XwMYxsQkAPSoL2WtqBnOSWZ8BeS1X55yOwMECgT0UZh7AQMTmGHNKrB1oIBcSL32Tw6TYUJUiSZpe8qV+s20UqeMpV3C5SWsA6OxuYih+ZTSKcjSfa18SdhHL1FFqHu5OvJpcjHruBLjhycSgTILH207sa1jC93T6c7URxywiDw5n7u54dmPK7oyKEDoM7jiPLLzgtZQSxN6YQ1iVYrq+4dr+bwwMLZTNYmaypMFef6kAQ4yMHlUg6iCr3c/4Zt/eNFf5PbrWZdPyJyd9Rmux8rGVhkFcqZdxgDiIbF15h/h3wLOnh4c49fyI+gQfc/XNsT/9ny/KE3ZrOkOYtCVd6H4xA= X-MS-TrafficTypeDiagnostic: VI1PR03MB3088:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /kNFV0e7Kw1KquKeOv8SndMDWWb7aG3D7hZu17Kw75EcBIWijKxIyn9goEKEjTL3hfQfOn9Ty6wfzwTCF1DuHKLyTCX1imniHbg3Q5+Sxg2L3uvCMXM622x7Aa6OhPs42VVjnO1nGP19iNlGQ1B/j7xpnPRk5S+2nAEeCjtIkKk+LaI2Siz3r1gfXqqEUzkWiiNJc4k3VzzVabHayuUFtjBksachd1slwwGOQqekNUZvly5ffYHwhFDaivnnyUUi8sr4rCCV8gr0Dsh5++uhA2Kg0XwGazC46X5jvFL2edMxNEp7AfswVlKBKJRuRFJ3A3QtgoC12lxPAEXgwoz/24/IyICKAV5pK7kzquzJxWvcZOO0GBfifCc05q1HolzN/Vo1gG7sD7kuclXw32WNiYzyrP5CUFlAsY2+g8aypWcq29jBGq5jBMLdvGB5+3/NS4bkSIZdq83x5bWqB/3+V6wMvzgTY8n+1gopjG3SHfFZZI+zA2xAbla3uoLl/cwd09Rt0gaAQfTxC9ExnQlLDjhEpLVTBU/MwfbRyNmdiXCHMeuCIdecvf21naDcSsYwZBiIP791sTskwk53U6mgog== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nhwiFEaPFOoe4slKIARnHwE4S8tC7VzYAWUKEtHOM/Jaqx8MSiNF25IpzsoUKe36wyCIthNvmZNI7XSwrpQCUz3Lvg3qBnB5+CiPVnahIYSg7eDUBzVjpflCIcJ9EMK8NnZsXTp71koda5Yytt3ZUWCKNP9LhDzOtTVnkriiLpo/yBY00pdev3Zv2/aJtZG1058ryyVlb3ULSPcetxwojBPHQsTiBdrWBkUmHiizTnCDY2YNDbKX0vqiKA+2J1ae4eKNnwKAZh6JUJwn5aYZ9eNb+nwulNBgMtd4m+MUKSvdxs7A/jxwCV69wUaRcQ7F7b/COvvhgHNcpfjC5n4VTJCTXrvYQaK/gFeyO1UtJROGpJjMivoDlo6dg6SrSm7SGxp3aoBJTfMWlDvuXmHG8o6v7rbj+5f0Ay2FKJhkiAQVFHyFKtIPvaZd3I21az9UbXFvKSXJIlBAbUGoWsh+2Jf3D1l1eiRwEYcZlHq8CEo6YSEqLPS2EzPT6eq3WMiymU7N9QXDfatfhT32xtvLaX8Ak/nN9Z09DAluE4nq/d7K5iTeXowIqL75ai4Jc0AJenyNUZkZyUlZ+0FahZCgS/TNzzZI9/2hCLpVtsRsT92PWFWn9LUwtN2a9OrQ5YGa+3A2Cu0dRBON6yvQAc4psXhRPDHLDaBkLrHdqXPIoTgJeEEquiFKMSMxTEvHzDnaITXoPFTNG/W6emjnEE50PCmEKc0GHE3d1AYZb06H59Bn/qfvEOGQcAAcGdr7ov6R3NHrhD2DVQEGRSQjomad/bhEB59tpBqdX6S4mJJ+QHnqlAAa1SOEbkHQ366DTNpnhXkFp8wORJA3tsFtFWC2WDmlICNSz5VJEmYw9TGJ5UQ78fnkQVioWMtXCAd6IXl2X8HgayIZi7PXc3xGelpR09zJoM5juiAW0ssuIAbyWFQ7oyQJjnVRCwshCKRsubZQ1i40/7JbvDXwo+4j0BEV1A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16e3455d-3e10-4e9b-a723-08d9df487dbb X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 14:47:49.1543 (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: VI1PR03MB3088 Subject: [FFmpeg-devel] [PATCH v2 16/31] avcodec/qsvenc: Reindent after the previous commit 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: yGlfgmITpehg Signed-off-by: Andreas Rheinhardt --- libavcodec/qsvenc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index a12f7bce42..a1093ae768 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1832,17 +1832,17 @@ int ff_qsv_enc_close(AVCodecContext *avctx, QSVEncContext *q) QSVPacket pkt; while (av_fifo_read(q->async_fifo, &pkt, 1) >= 0) { #if QSV_VERSION_ATLEAST(1, 26) - if (avctx->codec_id == AV_CODEC_ID_H264) { - mfxExtBuffer **enc_buf = pkt.bs->ExtParam; - mfxExtAVCEncodedFrameInfo *enc_info = (mfxExtAVCEncodedFrameInfo *)(*enc_buf); - av_freep(&enc_info); - av_freep(&enc_buf); - } + if (avctx->codec_id == AV_CODEC_ID_H264) { + mfxExtBuffer **enc_buf = pkt.bs->ExtParam; + mfxExtAVCEncodedFrameInfo *enc_info = (mfxExtAVCEncodedFrameInfo *)(*enc_buf); + av_freep(&enc_info); + av_freep(&enc_buf); + } #endif - av_freep(&pkt.sync); - av_freep(&pkt.bs); - av_packet_unref(&pkt.pkt); - } + av_freep(&pkt.sync); + av_freep(&pkt.bs); + av_packet_unref(&pkt.pkt); + } av_fifo_freep2(&q->async_fifo); }