From patchwork Fri Aug 27 14:27:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29820 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1515045iov; Fri, 27 Aug 2021 07:31:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyC1jTf+3d88HxrZHNOOq744BGHIeFssU0zmusA6fupX4uhp6z36ItZ47gWm2EcPe9DrgyA X-Received: by 2002:aa7:c799:: with SMTP id n25mr9858065eds.16.1630074704308; Fri, 27 Aug 2021 07:31:44 -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 10si5731011ejt.595.2021.08.27.07.31.44; Fri, 27 Aug 2021 07:31:44 -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=hFagBTXv; 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 5D1CA68A5FB; Fri, 27 Aug 2021 17:28:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (unknown [40.92.67.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 98F8668A588 for ; Fri, 27 Aug 2021 17:28:07 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=To/gkdPEwuV98wSj4gv1GhKDp4sroUWJ2d08GbHxEBexlLvfkV5609sy+3F1UrnkWvN9b/3txSefad8Xtf2XDziqD/QmyuIW0DvGlJHQfgWpwCVjzZeY0Wfb6A5otaQQ5IU3z4exYZOJU46sD0l6KGSLZE9FcIaKq8zTF/lPWYQ7Xs6xxWTRX6cWiJ8yyiNlLxILA2hl767icWyyHqiU4JVzcc7KU7aAe2ROtLScaJl3pHAVLuWtdgGx19bysf2pVX6R2sInZSrsyWRPnnAENPWvMCERBL9Yyw118w3uY51G8jZ6wsiw2jiOg63DlVkmlACM4WZwjlz1ELqxOuv//A== 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-SenderADCheck; bh=y2MLiK6lOzZpVhDKdwhJKvrAfi+pL7l9+cQg299JuYM=; b=DtcUbmnKMcknS7o9Db81LxAdtLQmmOnRCVpR1SZbZ+G+Y+WFtTgd1kBdALYiRslp2tP2JlmZf8ECtXNmcuQGeYXnegq72PXZRqQpzb6Dg+S0X4hlFGAvyKim3vSTlNmE2lHnoYTPMOfgDoJApsNq0QluAA0Rbv1H+Tf8LzukVM9GZO9bcnFEyBODQZBQZIUXdLA7+xm7urte8QDKod0uyE7oAAj0jRHffzs7w3LMgGRQljBtuxVYWG0j5UVAhWNdo7F4cauln+GeXeCpB+bBHjR65s+GnoTOAIGGG3NwfWyfbShPXtZOhIC6ngom0CD8+6lrOAyZch3terrsZcncPg== 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=y2MLiK6lOzZpVhDKdwhJKvrAfi+pL7l9+cQg299JuYM=; b=hFagBTXve9lLK3u89hEGdbrilCwjrn5Kvf8lCcyAYVSakMU1txQjKhJDUVe4zVEevc2wVTPlKrHPiMhKkPkzxCOZnF9CoU5tIzmcNOvRCe162BmucjpcMIyDQgab3KbwNV3wmBPxUauuUUWXdixOTIJ1/nM/O2e++3N89y0Crzq1QaejJL9l6TEOlDt2axRKeoUBclhxAy8duzlcTaGwZ97thccPPw5eVetKzAarAuKj2eJiBaGm2UY3srrpCEK/3Fr9SxCxqd1DuJ2ovVK3rlgNWcAnBb9Yia0F6bRaEeeYl0I53GBY/8+KgdlAMN6VfY82fCc/BLiXrk16F5s5ag== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3861.eurprd03.prod.outlook.com (2603:10a6:20b:22::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.20; Fri, 27 Aug 2021 14:28:06 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::5574:1fd:cce2:d590%5]) with mapi id 15.20.4436.027; Fri, 27 Aug 2021 14:28:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Aug 2021 16:27:23 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [r42Jzkts07lD/tjHEo7Q3pVBdfOOiVTE] X-ClientProxiedBy: FR3P281CA0031.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::9) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210827142725.645653-22-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by FR3P281CA0031.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.10 via Frontend Transport; Fri, 27 Aug 2021 14:28:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f51689dd-98c1-476c-9585-08d96966e29b X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXOVIHST31EzKLNwg5cTLbyRqsxVYAXnkeyQKfqqVRh86eDy9ZcAYt8dPPU5Wkg2PxiKXeY/V3YsBECVuWLLBLQAa96zpfKLZ/VHC5pQocZ/lUJbp4bnXWw8poR8SNv2SWzOnqBwbsFExqzJjUwUFFto2hVFu4vEmbdPXmGncJZDA3HHrQHviCP1Fs+8NTi5wJgv5p0jx0UJ42MUrOI+jLDCClSEq/lZq8d7zhGJPl4HWCehaQ/G6fOIfbtD0tIxCrGQPakZcr3vRghxLjfCL5tCVt1L3aj99gwIXbpZFmuyN01eBRQiqKNPZhrNfoWnYQjay39LZsnW9fLTJBBH4w0HdEg/9KLNoqtGybA8LPxKYJRYOucrln//gSoOjums4K6ptiVxqyTe/GDMUx35Ag/O5BklRnU9vp8j0TT4dWqAVYgQNFD3/AvlmI28fTkLQC//qw0vB6B5WIzba8Gjj00abmLAQHMaoBIYDStMuaTx4LmGbXKsxUhquN5x2i1FTV3u0cMjtYAoHcYffCsTRuQE3NwB/Td+fII3ILsgImB2v0FBJ5Z6j8/BK1mCup4CsGFGwVTbVfNQYI6vO7wzw0ttds0zCgSh3kSUwtbZCuhSMvqM69zmYHsfRbpIfgdDlTmSgViARiAurCSCCTqx0Edc/n1L0fhwcqXeJYdetaR+LbDyToHxli4Ofqdfs+LEGkfSq7Jm1w8Vr8lGNeL8/TyNzgf+Mhsrrs= X-MS-TrafficTypeDiagnostic: AM6PR03MB3861: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SZ6DVfSRPtVmomZTxteU/VABtcoMV+9xRufcrl5JJu+8Rigfkj61ZYDJTBnW7CdUimqxdmSjeh8RYydPI0rv5JNPTaEdvYMiYQFfxo2ByJSTZVkBHRUFCm/LQnR2yaCqR1f3mXJ1yEaqCjW4BhI6AbP74HcBweowsY+55JM+K3UlK5PB+soeqRVriHdhaldzqkuoHd/GoCdHSHb1IUTW1S1Q3P2mOKEjHX5F64wR9eOnwkd1FUHws03IYjUkjmOkAgqA2lWNc4nO6u9eotyjpd6TR7vndWj0zH5RiRQeJC1/80apZWxRNDn/vVCtohyigM/Ig0pkIIR/lqqVyXdUUUgLNVA7cDYWp1LKfiCiPZ8PNNUsus2IVUJ7wfBHIy1xS5S0UtDbpa1V5pZPBhiPPbdlrttkAQUVzH3wuErQjZOhKNYULALBa+9mIpcZPcfM X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Uq2bABLPEDAH1O01Q71H5LFZxX4OQz5XrvarVg4MuSU9Bz9W1VyvnkHPx6ThD4uBhyUAYrhaNcCfoNM9kiKdI8bJFPYzq8YDWwGwg5O7LfBsq20RQPYFFPEe7uAAFqFiB/o0jeXSLS/eZP9PH3Xn0A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f51689dd-98c1-476c-9585-08d96966e29b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2021 14:28:06.1522 (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: AM6PR03MB3861 Subject: [FFmpeg-devel] [PATCH 23/25] avformat/utils: Reindentation 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: OfA8M8kKfOWF Signed-off-by: Andreas Rheinhardt --- libavformat/utils.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index cedea97593..e86cdaa96f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4274,19 +4274,19 @@ static void free_stream(AVStream **pst) if (st->attached_pic.data) av_packet_unref(&st->attached_pic); - av_parser_close(sti->parser); - avcodec_free_context(&sti->avctx); - av_bsf_free(&sti->bsfc); - av_freep(&sti->priv_pts); - av_freep(&sti->index_entries); - av_freep(&sti->probe_data.buf); + av_parser_close(sti->parser); + avcodec_free_context(&sti->avctx); + av_bsf_free(&sti->bsfc); + av_freep(&sti->priv_pts); + av_freep(&sti->index_entries); + av_freep(&sti->probe_data.buf); - av_bsf_free(&sti->extract_extradata.bsf); + av_bsf_free(&sti->extract_extradata.bsf); - if (sti->info) { - av_freep(&sti->info->duration_error); + if (sti->info) { + av_freep(&sti->info->duration_error); av_freep(&sti->info); - } + } av_dict_free(&st->metadata); avcodec_parameters_free(&st->codecpar);