From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 32AAB43FC2 for <ffmpegdev@gitmailbox.com>; Tue, 23 Aug 2022 19:04:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 18C0C68B9D7; Tue, 23 Aug 2022 22:04:18 +0300 (EEST) Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E942F68B9CD for <ffmpeg-devel@ffmpeg.org>; Tue, 23 Aug 2022 22:04:11 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1661281451; bh=pGiAiW853aSI8k78GP0jwD+/w58ppTunP/D8hwB56o8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=cDOCIR4joRHh5+fhXkrriC2mwfrjhTvuEbcQh0hZU9mKRxpx1TTxweUvxgUZk5OSa 5SizFsvCI5JyiVTrlS6DhVuLFaTPvz0DUDtksWvucvtfd/Kdiyc/LNeQnDLkgVvmzJ gE5UafXzykPB8fU6pBdGxrjC9oGy3RXFUwqXc3uw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([94.134.107.162]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MKKZ3-1ojcJQ0rUt-00LpGp; Tue, 23 Aug 2022 21:04:11 +0200 From: Lukas Fellechner <lukas.fellechner@gmx.net> To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Aug 2022 21:03:26 +0200 Message-Id: <20220823190326.249-4-lukas.fellechner@gmx.net> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20220823190326.249-1-lukas.fellechner@gmx.net> References: <trinity-36a68f08-f239-4450-b893-af6bfa783181-1661031307501@3c-app-gmx-bs35> <20220823190326.249-1-lukas.fellechner@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:s52o+CP3tFVlaG06/+mz1noghESD+cO5SrteQvgOOurzkaPEIPt LFA/8Nm3zdmwpLXYjbHoZTz8kWnp+JRRFsuvnOT96T4UBu45HN1BfGD8NwAQeT2tStMC68S Rou84UEBrdA+SD6J0GXAKMTbuuoAQNac5KcEa+KihUWM+3w8JHPHOBPXtFKUUaBoXm7BZ1u BgqGBwOwS2WFihfaJmmSg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:PKfJgDiI6O0=:rybm1nqmvp59o1TOUBajEo ArdgV2XZR6uZDcAx6UfC+9eKsXZZcpmlj6DnZTtVQjXiTUcWQ3PLB/OLLOUMUb1q0U28L5UVq 2cPIdejOJjpZ9TMZ/Osiba6sUXrj2sodk2cEtfmQbFpy34BEe0LwjEE1U1jBz2gr+yqiiMOWl bYNtpXsWkhgge1kI3gFQ7sL91sXTzx8jJ2y5wCpTHOwGnECqCIMxMa0ju0IMZR4UIV96OG7Ln 6Yjcby4Vy/ru4xYA3G/E5KsqDgLiX+ggCHm+2/D6//PYjCjhlFp2KXin/V24bV32rMdsbP+YY 94YNMs40GlmolHJQbpK2HIxnR9avaAxwShJ2xmT3lJ75Dk6P4dn8ZFcrNYrtBPVgxs8PhRNMZ eKhoat3681eJaHjSoyN1E9vtUxLn040DtwZLfzsranoL5AlWHMfCiiCO7TrZdUirEvdp9XlG6 dLV0XtUd21ArI86e+ChXHZH83ONVCsKLQHC8JNcUZZAsnuzi/GnXMTHq7RS3o5hyKLZVdUzS+ z/BCs2xV3hC/5lK/MIzKn9rxYz7Mzow4aJqvKuAL6hw/22YxMz47hwjWfygz+O9JaQN6HZ/MP AG4vjdfofd4MJ9PaUTSw6vYBJUvEbhkF31QIFmRPdOu2SwJQrRtRY61XuRiFGCDI3FwvENcLI M3ImcKebbGSTDYcftpSrb0Dm3MRxZqNuK2rYwm3LJMsAhcI+2sdPCfR8YBW4+FbLuIcxcRYYi F+Bq473AffX7sKqklU8qnrwLkiFA06L5bPOK9j+llxW7jOXehD0p1xGDTcMq4YRAt0qJIjj8P CT2dBf4BP8Bbu0wXPG+ubL5xYE3tEVGzUOSCQOuucDJcsduIbjtZbm1HZYHqh83WTvh3w+bIA pUGGyT0jyPEE12aPR9v+lNC1DuTnJzHH0ILjZycM4H6HIlmjg+TC39mmSAFR1zPZ9CVDoHX6E QD4bd8a8sJ8iuLX1lesg67DPg3cI2jMuuvDo3sNhgFlGp4pzZZr2szefQ3Y786RoX+gv8AIGd aKWlzwc3G/EHrgQpzQwwwjIq3M8ktDbtpzVkO3TMWgyvaCJnEuK3BqiNdYNK/I4eAHTCPzH+H NRrknKbtPHSstNDf9scoSnvTl9WFvgzfjQcIBfBT1RNfcqAegMFK9Kljg== Subject: [FFmpeg-devel] [PATCH v3 3/3] lavf/dashdec: Fix indentation after multithreading X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Lukas Fellechner <lukas.fellechner@gmx.net> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> Archived-At: <https://master.gitmailbox.com/ffmpegdev/20220823190326.249-4-lukas.fellechner@gmx.net/> List-Archive: <https://master.gitmailbox.com/ffmpegdev/> List-Post: <mailto:ffmpegdev@gitmailbox.com> --- libavformat/dashdec.c | 74 +++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index 20f2557ea3..f653b9850e 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -2412,54 +2412,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 */ -- 2.31.1.windows.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".