From patchwork Tue Sep 20 20:25:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38118 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2185738pzh; Tue, 20 Sep 2022 13:26:08 -0700 (PDT) X-Google-Smtp-Source: AMsMyM61UCsuEI2H4WavOX2GvMwCSWz6VNBP/AYj7lZXX4HqHMIXeLh0RsNegYKJ3czTMVWvYd84 X-Received: by 2002:a05:6402:27ca:b0:451:7b58:1b01 with SMTP id c10-20020a05640227ca00b004517b581b01mr22328500ede.61.1663705568141; Tue, 20 Sep 2022 13:26:08 -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 z24-20020a1709063a1800b0073da5c8de1asi586610eje.178.2022.09.20.13.26.07; Tue, 20 Sep 2022 13:26:08 -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="Y9i/BELt"; 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 D530968BAAD; Tue, 20 Sep 2022 23:26:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2078.outbound.protection.outlook.com [40.92.59.78]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F236868B3FD for ; Tue, 20 Sep 2022 23:25:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EVyQt2aXL9PV1PGcIlm5wBPS2BDhSfbcIRRmCgzyVBwKnoQxKYLYmSRyDKU0YsWSaMx2v1KcEXs7iiQ5JFRG2vvVN0C4cYzRP776glgDyQvjh36dpW2zp7b+x7/t0xh1eQFYKMKpcmTyRot7/HQNRg+Dmb3Qt/xUPheiP/mjwB4OgNINwjGFZhXjpt49A7y7zjYwWDLx8NE+NCRdsULDA3dErQb905t+rp/5eiUBRLj+1YpIBRHykaYvArNfVQFse9zYtcBt0uMUoUU6DDpvPRfZ/3ibympU/NnKj6VB3kzm9SS73QwcW6h4aRSJTbaNw61ZuUQyWbB6iUvBGXPoqA== 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=9bRKGjdPsqPNIi2dDTxtT+MeHpwbmB1hUQ4nWHGkn2M=; b=FK1XcBUUXb1UJG9Q6a9YXhQ8OURWB/KPCGRrl/rOEXYWwEx3qKM9nxZhXRkAccCYXwlb4nsk3h/1iqsONHQmSFk04HrM9fpC4+nqgLMfUAHIxafDBMGQP89DJqDeot3AmOWIpt+Zq6lf/8PRgiF+saFMq+BfDJPjCpi37Eox05HdG98EBE8vmf96i5l6YV/0hmFR1ewDNu+pq+NJKSMJ+VD0j8KN3kbDFF0/98vUhpJeo0OoxRvV8IqUGQwx4Lyhwo2C9+5GYsw1vEitCXizv9NEH4QflGOcodg/7xvQ3+539dN96s3TCpfg7FRjPevyc4Dxmf1zQeXE/PY1nURZDA== 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=9bRKGjdPsqPNIi2dDTxtT+MeHpwbmB1hUQ4nWHGkn2M=; b=Y9i/BELtFvMxoIz/wqXtkkaFhghnnghE4ov1iz6qAR1BVKmYJqvlSrSkZqK9VCL5vP4RrFnekuCYi0eZN8/CM5tFWsy1Gn9xU5S41LAoexuMWPmnrldsnprJHuXp/aPjMkw1LdvTzuzLOQvoiksdFTeVZoeeC4wbJExJGwq6R9/bVMy25hBP4Qgdcr2Jncwc+IZViStBPOBJCg5EPHHHtmWrRrjBzSQ2YNQK0wP2FDwwUcNi0FE7y6/eJ5ck2vsDdZ20ahL+UJLzyTHmJhQzHc5zdIXOkB7cnET+1LlOrOtpDfcoYlIWSc/tYZpvUoK8he05hwZ24BCEjH2eTi01pA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0795.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3e2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.21; Tue, 20 Sep 2022 20:25:56 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%8]) with mapi id 15.20.5632.019; Tue, 20 Sep 2022 20:25:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Sep 2022 22:25:53 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Fx1xBDQjX7CPtKyK6ilVC0pOIDnlDR+5sUYJ6l2T8S0=] X-ClientProxiedBy: ZR2P278CA0019.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220920202553.5991-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0795:EE_ X-MS-Office365-Filtering-Correlation-Id: 67e24a03-66ea-4ee6-5ccb-08da9b46528d X-MS-Exchange-SLBlob-MailProps: a+H6FLLcF3pGJJeGdUv0lC5Lko8ACOO7eDNYDEMmvMaynRKzC+4S7szTAuJa0QqIAhPW46u5UqwdBhSq5o711BCVVwSSlLcfxHPVVfSpu3fW4I6bVvmbF8bYY7v5DrLnPduUgJHEFDahsJ6VoU7KAmdWqids+y9jLHJh74SQCKz1wKBj1mCOEQ1XT9hX2pGJEx8BvStmCZk51fkyk3/E58oN88NDOEp0Z94z8+n9NnLHE9VUXI7Kfg2GAAqfUNwgTTnpgVvicdOfe/dz173jEPj0ITqr067CwhM30ewGdcktBpOTXxm960JnyrCxlKKEO6gXHNNvvmo6x6ZI3PdWaOvn2Kq5HOQIGKJJQArSIKaJ06S5gGYWktDTSQDgN6cluJzBMdzqVb99B5WTDvGNOmBWXTHCPnPaw85bWYX50FQcloc1oZwRfg9EwVIqz7FME2lsCB3WkyMm5DWRyKuKD5+TQfCsG7fE509rLh8wZb424yGHo0Q4ESZPmRB9nGg5+R7ImEFfUEYeZGzdCCBPLlUzS0oaWaxwU6H/x5/FJbDzilVHPu2rVRWVnr9G3bPSJGUFaxRGq2pno6HXNEZuz0U49oQ05vArpfcTWfyc9wbIfNIR82ppZWBvuvHUPjthKjc2rwf2aR17Erf43tq7qzrowyIOyTZgx0qec74V0o1imzSMGzN2GY0D9qmcXZLSeCi/5GST6xg06qFZu5oiQe9Tjpul2FkvCBIwFd2sNVd0zYhceAhtqRfWp0S+c+n6u9cSHu2h14gAD8M/+n/b1WwfEft3pZ2DuClirBT6MuDNLZawiRf3EiIcW9NKdBnO X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1aSZCyIiXdL5SIsIwrxpwNNsal2mdNR5LDWWUmi2lTZp0C1h/EMU1ClpCz9TpbMYBdGqCrZ0pcMO6fhm7QO6ForD+wwVoowAEDAUU62YauH5GbkIs9NuNu8fJ9xKOJQqzUzK6OsdraBNCkoj2SXhenKKMOwXhXlg/5YsP0KXxhjEume6dH4B3MiA6nv2QUDuUMuenepxVmxmKYt/qsnQbpe21Wz0zhTjOYCKz+o28Y8PRWboK1JguxSnLR3sRC/thhsfFVe3zEVjy20k9XX09At1Pk3yeJUASJ6mAGClF0YRUETrep4ncewUskQxrWr5SyjO1aEfYPHQ1qgY210GnVm4ajNK9agAmtVNKtpiK71D0FsW+A/MRPH21OLj4mUaqxVdztcpS0npfzdmALmUxz02+r24FAMNJ7sxHqdQCVQ9BOozMpG2xUCzTWoRtWMn8dLXpC+2tCb0mVQ6C8bXHo27lUDjQyPqEKGZJXoCd/t50LmHWyPGG4DFMS5K0K0ESPY8DKGg5+t5m/uFMxklxpHTz5OjBBwdtHW6Boaabeb8D8Y3WxbbRpy8zWBsVAP0PDRE3FTcrFUMQZ+ASXLvaNfabXl0H+oAUGOIAjWfIaxHw2ZqQJBiURtHr8pnMQQ0 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 69waKcFjmWG/76vACyWN8PHaTslOg+8ES0rWoXA0j0dVLPgmZQTKcrMYgbD7MOLeddxhWgi1PuUIIbvgG5RRogG/zaNcjbem6iBa0vespSCRa21FbzZhOWkwpP+39qdchXyQW0V14fhNz41mCsj+gBYGqeN4uhhvPiuDytPkNkM5N9513X6ysMXjK1jLOtBGTiIXw58N+X789fBbEnZUBqsKhjyZfR6eDwoo0mTG6sNDIWNJlzMCcJwIyWsoElT2IFcQMDH2lC/D1+6LZT1Wq96F4QJ3EjnUN9K4tqaXPCNyK+IL7jJPs5cXJYEXItASeWbHII8EzrOYUvyXqlf1XeUnzCUV1XhBvZ+382JJgp/sGzm+bxEBQ/ZQ0oNGI+1ciIMk0VHME2R+HfB7S3bM1A7Dph2EYJcAivcUZtqINvSjpGvEDpEDKOc0l+h+qhyzvYLQBgVQTqXfvOq90o03aI/TBogAazf5HEg7ladDRGeKuGFmQPWJgngC2+BwgMTXwsPNCCootAsJgBLrtgo/sWeC70y2IVhY20Kt2h///LL4+8wzBrGg/ZnDUbez0thKFL45ON/X9wLjVUt+FyWtnNsi1uzk/Z/YWGNPx0D42URtOrNMPQcwgEWLwMTS21rqsBrRdEWd+/3QrNQDQdmVlWKOBinA4gC1pmdEusZKrLTB5VDJveODIIztFywMJiFnE7cQVDifZly7aXk9DkLsJ4jGqD1vLoxNsTnpHBTMD0zwISyICUVDY6NxvlakaP2Jtl3fj/4cs2ZbLaYV6jp3HTaCgRseWj+jI0+rv2MKU+Xj7f4t8NSOThcR8b84mvTwBsF///5ewenpTsr45MgRtIDHfqAbyUbTZ7DgXpgRmKQHizcoejZhZU1rsYPNGUwig8OWTwGoCOgYcsXU0KQVjfXUuywKVxt6yAMgieIJGNIZFbKXpYWozYU+SM4ohkkQzMC5l4KIHkmaTOq5ybzcLVyeakydw98SH+BNi7i7ExWep0ipzdfg2rjSIpQBNlufBKCbmJOqSPvxW95wxCD15XeYUg4sOEcL2xIRbjXvlQSCNVEkPVC8qu0Atwrh9Qqvb1UYkhcFBzetYMkZxzP5Ag9cHQVmRaiOmx7gPBGp5Sb93mVHssxEtB50oYRJYQ/o76vUzTQgvE7mb0e+SZdXGDJLcuEeHEC9IfBhsbkpmM8PW5wzFNp24AAsXXJfClO0zj0i79D1u/1MU9WzWTzBN1cIDkN1AZnZveV+kYxhd7+Q8SKnRt0ZpJK0vxcaFwYQXSaOinDe9EamXRsMHtctiKzTFJS0RVuT1+KQauRNclk= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 67e24a03-66ea-4ee6-5ccb-08da9b46528d X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2022 20:25:56.3389 (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: DU0P250MB0795 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/dashdec: 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: 3T7/q2eyZEbQ Signed-off-by: Andreas Rheinhardt --- libavformat/dashdec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 2ca91bea8b..29d4680c68 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -961,15 +961,15 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url, int is_last_segment_number = !av_strcasecmp(scheme_id_uri, "http://dashif.org/guidelines/last-segment-number"); xmlFree(scheme_id_uri); if (is_last_segment_number) { - val = xmlGetProp(adaptionset_supplementalproperty_node,"value"); - if (!val) { - av_log(s, AV_LOG_ERROR, "Missing value attribute in adaptionset_supplementalproperty_node\n"); - } else { - rep->last_seq_no =(int64_t) strtoll(val, NULL, 10) - 1; - xmlFree(val); + val = xmlGetProp(adaptionset_supplementalproperty_node, "value"); + if (!val) { + av_log(s, AV_LOG_ERROR, "Missing value attribute in adaptionset_supplementalproperty_node\n"); + } else { + rep->last_seq_no = (int64_t)strtoll(val, NULL, 10) - 1; + xmlFree(val); + } } } - } } fragment_timeline_node = find_child_node_by_name(representation_segmenttemplate_node, "SegmentTimeline");