From patchwork Mon Sep 5 21:16:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Fellechner X-Patchwork-Id: 37684 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2868474pzh; Mon, 5 Sep 2022 14:17:44 -0700 (PDT) X-Google-Smtp-Source: AA6agR5e6ccpNXBER4B34PKUix/9FQ5PUvKv9EAvbda3rTkUoi87DgyibyvJnFdhtkyDMsRiL4pK X-Received: by 2002:aa7:ce85:0:b0:44e:7f2f:134f with SMTP id y5-20020aa7ce85000000b0044e7f2f134fmr6165674edv.361.1662412664620; Mon, 05 Sep 2022 14:17:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662412664; cv=none; d=google.com; s=arc-20160816; b=UZkKp0IQ4Ti8rrFiwSHBwVU8HOMtXomv1DbB7DjQlL9IdL7OyBa0RV79Bvw9eptyin LDSKJ4QxOsbx2QKrtjsjI/5gvcx2G5v9UAsfF4BpFmHt3gJUnWnj3IR2mfqMcnJQ6/Qf TXYhp5vT27Wory6hrHA8yTPV6r7ZnK44UQNhto9paHV1V1Y0u4yJIIMZjBvhLrXzarvL WOOH3R/PXYvUW/wMMnU/3hTOHWGEp9zjCsw/M4slr01WhvtRZfMwdznk+Sh+JP8s9dck CT0m59v2GOL7zh5UsUXajh0dg/f5zzsD7QdaHImO2S3iOwd6AruONZxXAwSoQD6O2m+i YEAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=/voW2/z5qULLToFFVLFxgQVsAHphhPzu6V1rjjsY+mc=; b=yQGfWtdfifLTAHbmAUS3CsJdC6ZDFGrCdCWAhpZPwVVpjW6qvkMzEB9iZwSgVX69G+ PWHBy6P82ZI5+cUbOSQzynN4Wr3WvpUNU5eJPtWlKJ6WubEGywTRB9+Yup6FgHcD5xun kj/4H1BBXbRm4sVtb0gfqcUcD1R1rv7y6TNuMWVYOQl5vcP8pt9ADhhlbYHpe9tfCMRR GEmUhuTxR1ZtpPEyybs14oBnOiX4JeTI3lkMQPcFfWLsblHb5IVRDI00/9HSN+OuX9+Y IXdRQSabKnIRaBz0iY246465vtodRqWVUU1RA00sbk+mjJmcYGN8VtQ0f1eLWBxz5ocT ydbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmx.net header.s=badeba3b8450 header.b=fhtdquZ4; 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=gmx.net Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k19-20020aa7d2d3000000b0044eb919cd29si1008678edr.161.2022.09.05.14.17.44; Mon, 05 Sep 2022 14:17: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=@gmx.net header.s=badeba3b8450 header.b=fhtdquZ4; 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=gmx.net Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7FEEC68B9F1; Tue, 6 Sep 2022 00:17:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E453968B9B2 for ; Tue, 6 Sep 2022 00:16:58 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1662412618; bh=fvoOCewD9H2/nxNiZABzh6oBx5vEiBBHEGyezikooUs=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=fhtdquZ4AXK2/hPWOA22fnOuFmyu7rfpwosg0iX0kDkCOL6AMTReKYbYVmIzUtiw7 5zFQqxxfNelss8thWcjL2N+PvXcwoovSRR+Vtg9P7EsdIa9YIZlA8/10SAd2xhIov2 tSmzO2edt2g4vOr3yCqfWOlisttLrbNVgxmf9XH4= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([94.134.107.163]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N8ofO-1pOuAW16KE-015tiJ; Mon, 05 Sep 2022 23:16:58 +0200 From: Lukas Fellechner To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Sep 2022 23:16:34 +0200 Message-Id: <20220905211634.1460-5-lukas.fellechner@gmx.net> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20220905211634.1460-1-lukas.fellechner@gmx.net> References: <20220905211634.1460-1-lukas.fellechner@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:8IKXfyYc4nXNRHSbbMpG2IftE2R6L5YfoBrLOUEH0wik5BH6XVW 42G5UHHkrDwNTQY3bMo0Zr5XVq88D3adjNUmc2fQ2XoSKgmn3EVNrmhanRYqZ/NlclW4B0q BAZifnRBfgRPcTpYFOsBVNFeIYCoFRSdsyLtyIIxhsoyI+iQE4sS0Q05Z6/mGljLpA38XpB JhuFGqa8Y5ug/RMWFeviQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:CkjHl/g75XM=:UI9HLCY9JOPZ9JEtLbEVdU zRjrWyXvrT6AMM212XepGhX0aaDK9OMhDyLgxP7q4t0nCJTePCpa81a5iFUmP9GKM1SxgsfCT jumbqN6geQxjAd87ILctLp6wHc6+JzRF+7k0+Ll3aNqT5hSyjez9xYifd2FrDVi5JpMU0Vem2 o3se9IXjfzmph7nrT3tpFUxOOxDYswYcAAlpKeNKfL1i4nIFRMI1SBtKY+g0aje8d8jQmRr7g yazPHhSSTGc8+OTEx46iOOD9XnJWkkq0vwTpWvWZeLRcXiK+059jsGgvCZllw5BwvY+pEA/e2 /z4vnN5IdbDnNE2i1DAuVhlEGnYXHNokEJ41mKIdemJPNmyNICUxdFJx6wxDO98dyA7499bmJ /bgGIO253JBpp6Mahz3UxEILjSvsylpldzcCIbbILW7eQ9IUfksA/3RsftEupdrciSVeJaZdI Q0RxTKoIBez9WIyGNg5C6hWsORYBjukbvS9f6mKE1dzGJQvN9nYiPtuYXxflqpDZQzHDgxNIj fKIrqNcY+4rDbr7fANjvIOm+jkWch0bmT9hQK/O6lpiyOaWQM+EBdSDABhYsJc5vuXX8Dg13+ c2uNLXBqrIXdBkAJctjXDw/eDB+QWWdaVLrlv2na6rvk+dR3x6NQEKwkrAIo+6Ua50ug1kckb +AYTCYAReKvjJnxXx7YMTNE8IGmhty9+ppZ0BD1UX0A88Ov3cqpsQR65FAvsq9rEqMm3D+mvi fzv2iyMOnZHBxRHdKpq8fpV75CGbMO/gy2fwszN/CZeCAi+De+I05L1IeXQWPp+OGFlgYqaWF QANo3zQWz30WO0bXTJ7hJCwwMFKISAG8LWviuLhBav0Su3K8/o0Z/QgCXhhr2iOb+6+U71NWN rTSYqWc4cfXZ1AEBDf+C6M1H0mEeUEd2CuQSl5l3AxOg76St5ZexXRbvJEN1LzvyrsQ3qcxiX PaEqpmkYPcwzM9FR5waAOy2bgVlsnB8dJAIZjbsmneM1po9Qn+nhzINAfoh+Eh+cFTfd+OLh1 0Pkid2iSSnC1QRaw1jWW8KFzlnhhRZzgnsiGdUhtS4zODt6OsC29CBGbpynZUyVzkvB4fIp8g yhcF1rbs1KpVpULjAgxLQSgAutt7HGe8WpZ1EDiZofH+dgNQPRrYSqvaheZD5IruK/L0bR9c9 DvmplJZz1jBcuWdCTQKH6zCux9 Subject: [FFmpeg-devel] [PATCH v4 4/4] lavf/dashdec: Fix indentation after adding multithreading 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: Lukas Fellechner Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YyvVvQxmA552 Whitespace change only. No functional changes. --- libavformat/dashdec.c | 74 +++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 37 deletions(-) -- 2.28.0.windows.1 diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 19e657d836..22f727da3b 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -2377,54 +2377,54 @@ static int dash_read_header(AVFormatContext *s) } else { - /* Open the demuxer for video and audio components if available */ - for (i = 0; i < c->n_videos; i++) { - rep = c->videos[i]; - if (i > 0 && c->is_init_section_common_video) { - ret = copy_init_section(rep, c->videos[0]); - if (ret < 0) + /* Open the demuxer for video and audio components if available */ + for (i = 0; i < c->n_videos; i++) { + rep = c->videos[i]; + if (i > 0 && c->is_init_section_common_video) { + ret = copy_init_section(rep, c->videos[0]); + if (ret < 0) + return ret; + } + ret = open_demux_for_component(s, rep); + + if (ret) return ret; + rep->stream_index = stream_index; + ++stream_index; } - ret = open_demux_for_component(s, rep); - if (ret) - return ret; - rep->stream_index = stream_index; - ++stream_index; - } + for (i = 0; i < c->n_audios; i++) { + rep = c->audios[i]; + if (i > 0 && c->is_init_section_common_audio) { + ret = copy_init_section(rep, c->audios[0]); + if (ret < 0) + return ret; + } + ret = open_demux_for_component(s, rep); - for (i = 0; i < c->n_audios; i++) { - rep = c->audios[i]; - if (i > 0 && c->is_init_section_common_audio) { - ret = copy_init_section(rep, c->audios[0]); - if (ret < 0) + if (ret) return ret; + rep->stream_index = stream_index; + ++stream_index; } - ret = open_demux_for_component(s, rep); - if (ret) - return ret; - rep->stream_index = stream_index; - ++stream_index; - } + for (i = 0; i < c->n_subtitles; i++) { + rep = c->subtitles[i]; + if (i > 0 && c->is_init_section_common_subtitle) { + ret = copy_init_section(rep, c->subtitles[0]); + if (ret < 0) + return ret; + } + ret = open_demux_for_component(s, rep); - for (i = 0; i < c->n_subtitles; i++) { - rep = c->subtitles[i]; - if (i > 0 && c->is_init_section_common_subtitle) { - ret = copy_init_section(rep, c->subtitles[0]); - if (ret < 0) + if (ret) return ret; + rep->stream_index = stream_index; + ++stream_index; } - ret = open_demux_for_component(s, rep); - if (ret) - return ret; - rep->stream_index = stream_index; - ++stream_index; - } - - if (!stream_index) - return AVERROR_INVALIDDATA; + if (!stream_index) + return AVERROR_INVALIDDATA; } /* Create a program */