From patchwork Tue Aug 23 19:03:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Fellechner X-Patchwork-Id: 37419 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2071684pzh; Tue, 23 Aug 2022 12:04:34 -0700 (PDT) X-Google-Smtp-Source: AA6agR6Y1ym5OkwumK9vPx8LTherpghfhUcBdTZBrHg9DF9W6vBq0ke+fFMiFveqTNK4t1Aa+M8K X-Received: by 2002:a05:6402:518b:b0:446:f8b6:5bdc with SMTP id q11-20020a056402518b00b00446f8b65bdcmr4871794edd.53.1661281474711; Tue, 23 Aug 2022 12:04:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661281474; cv=none; d=google.com; s=arc-20160816; b=CbaZbWfONskTavPFfV1HIf1SgC4YszPNa/3O+yvEqmmC3IGEUC3g5rWq2SZ7Q6ibar pCSmQ4VHfHKh1lifr0scU7G6fvdkHKrbrCj0wuDasuuqJg+k7g11FA5Cc+WpX773ciP8 vuvcOJmy0Z5gXldM1y8etIulcIYbDRyvEyltSUcz38cy7DWfn7cjPs0Pg2mowXnYfomP rCQk7Q7Jd3eitscO26KLoa6tDmfwQfJ9kBwO9Q9YcxtY/Hd77zwYiI+jOjQ9S6pA+8J6 2RmuvQmhyW1X+K0xAHS8/V9qBJFmbE6spL3TeS/5iDwNKMFHY6ratLnCnXi3ecfD29pW CMtg== 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=aeLnObGkq5pL5SkmvNc0NQXd1bnR3ICr2j6H6k7RJB4=; b=OE+W5ST8qqwxwnQ8cULSZ6NqL3PQ8UBPJg7vYA0YG8IUPdrnFWsD740KW0b4irzwFK 4TBqyXjIj4q5dlJT0WKZtvsMNApwK1Q2BdLktOII1qJInUFB7WBkkDDAxN67BOLbyUHp 8cY6/h9Jrg2FLs+zDULzbrIdj0tpx8uKFl0+e/vQs8hqgy7mjgnmJ7IZy/UcOw7i1FGf 3W6T+3a8rp/F/SAKUNyBZVuDu/vct8neXmrGspLxSdpuTkmp6uCAjTHTR/7v+jbNvQr9 kKDusVup9Sps1zYBdFPRQZMrqWnuMrsCpGeRDXxcWjHYHGC0lmb34CX3fRoGqHOgMbrK LDKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmx.net header.s=badeba3b8450 header.b=cDOCIR4j; 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 ds15-20020a170907724f00b00730bcba7f70si418191ejc.635.2022.08.23.12.04.34; Tue, 23 Aug 2022 12:04:34 -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=cDOCIR4j; 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 47EE368B9DA; Tue, 23 Aug 2022 22:04:18 +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.15.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E942F68B9CD for ; 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 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: <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 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: 3iujf5/LSHzD --- libavformat/dashdec.c | 74 +++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 37 deletions(-) --- 2.31.1.windows.1 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 */