From: Lukas Fellechner <lukas.fellechner@gmx.net>
To: ffmpeg-devel@ffmpeg.org
Cc: Lukas Fellechner <lukas.fellechner@gmx.net>
Subject: [FFmpeg-devel] [PATCH v4 4/4] lavf/dashdec: Fix indentation after adding multithreading
Date: Mon, 5 Sep 2022 23:16:34 +0200
Message-ID: <20220905211634.1460-5-lukas.fellechner@gmx.net> (raw)
In-Reply-To: <20220905211634.1460-1-lukas.fellechner@gmx.net>
Whitespace change only. No functional changes.
---
libavformat/dashdec.c | 74 +++++++++++++++++++++----------------------
1 file changed, 37 insertions(+), 37 deletions(-)
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 */
--
2.28.0.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".
prev parent reply other threads:[~2022-09-05 21:17 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-20 21:35 [FFmpeg-devel] [PATCH 1/1] lavf/dashdec: Multithreaded DASH initialization Lukas Fellechner
2022-08-20 21:53 ` Lukas Fellechner
2022-08-21 4:10 ` Steven Liu
2022-08-21 12:47 ` Lukas Fellechner
2022-08-21 19:26 ` [FFmpeg-devel] [PATCH v2] " Lukas Fellechner
2022-08-23 3:19 ` Steven Liu
2022-08-23 19:09 ` Lukas Fellechner
2022-08-23 19:03 ` [FFmpeg-devel] [PATCH v3 0/3] " Lukas Fellechner
2022-08-23 19:03 ` [FFmpeg-devel] [PATCH v3 1/3] lavf/dashdec: Prepare DASH decoder for multithreading Lukas Fellechner
2022-08-31 2:09 ` Steven Liu
2022-08-23 19:03 ` [FFmpeg-devel] [PATCH v3 2/3] lavf/dashdec: Multithreaded DASH initialization Lukas Fellechner
2022-08-31 2:54 ` Andreas Rheinhardt
2022-08-31 7:25 ` Steven Liu
2022-08-31 12:17 ` Andreas Rheinhardt
2022-09-04 21:29 ` Lukas Fellechner
2022-09-04 22:50 ` Andreas Rheinhardt
2022-09-05 10:15 ` Lukas Fellechner
2022-09-05 10:45 ` Andreas Rheinhardt
2022-09-05 14:28 ` Lukas Fellechner
2022-09-11 20:35 ` Lukas Fellechner
2022-08-23 19:03 ` [FFmpeg-devel] [PATCH v3 3/3] lavf/dashdec: Fix indentation after multithreading Lukas Fellechner
2022-09-05 21:16 ` [FFmpeg-devel] [PATCH v4 0/4] lavf/dashdec: Multithreaded DASH initialization Lukas Fellechner
2022-09-05 21:16 ` [FFmpeg-devel] [PATCH v4 1/4] lavf/dashdec: Prepare DASH decoder for multithreading Lukas Fellechner
2022-09-05 21:16 ` [FFmpeg-devel] [PATCH v4 2/4] lavf/dashdec: Multithreaded DASH initialization Lukas Fellechner
2022-09-05 21:16 ` [FFmpeg-devel] [PATCH v4 3/4] lavf/dashdec: Prevent cross-thread avio_opts modification Lukas Fellechner
2022-09-05 21:16 ` Lukas Fellechner [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220905211634.1460-5-lukas.fellechner@gmx.net \
--to=lukas.fellechner@gmx.net \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git