[FFmpeg-cvslog] ffserver: make statement block unconditional by exiting early
ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet
| Wed Jun 24 18:57:42 2015 -0300|
[36a617c1625d5b05afa00e24c5e6291eb64c2bdf] | committer: Reynaldo H. Verdejo
Pinochet
ffserver: make statement block unconditional by exiting early
Signed-off-by: Reynaldo H. Verdejo Pinochet
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=36a617c1625d5b05afa00e24c5e6291eb64c2bdf
---
ffserver.c | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 1be545f..b9b6d96 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3594,16 +3594,17 @@ static void build_feed_streams(void)
/* gather all streams */
for(stream = config.first_stream; stream; stream = stream->next) {
feed = stream->feed;
-if (feed) {
-if (stream->is_feed) {
-for(i=0;inb_streams;i++)
-stream->feed_streams[i] = i;
-} else {
-/* we handle a stream coming from a feed */
-for(i=0;inb_streams;i++)
-stream->feed_streams[i] = add_av_stream(feed,
-
stream->streams[i]);
-}
+if (!feed)
+continue;
+
+if (stream->is_feed) {
+for(i=0;inb_streams;i++)
+stream->feed_streams[i] = i;
+} else {
+/* we handle a stream coming from a feed */
+for(i=0;inb_streams;i++)
+stream->feed_streams[i] = add_av_stream(feed,
+stream->streams[i]);
}
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] ffserver: make statement block unconditional by exiting early
ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet
| Wed Jun 24 19:03:19 2015 -0300|
[08724da976e9645488c215327a47c2c5a51fbe33] | committer: Reynaldo H. Verdejo
Pinochet
ffserver: make statement block unconditional by exiting early
Signed-off-by: Reynaldo H. Verdejo Pinochet
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=08724da976e9645488c215327a47c2c5a51fbe33
---
ffserver.c | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index b9b6d96..5082a4c 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3771,24 +3771,24 @@ static void compute_bandwidth(void)
static void handle_child_exit(int sig)
{
pid_t pid;
-int status;
+int status, uptime;
while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
FFServerStream *feed;
for (feed = config.first_feed; feed; feed = feed->next) {
-if (feed->pid == pid) {
-int uptime = time(0) - feed->pid_start;
+if (feed->pid != pid)
+continue;
-feed->pid = 0;
-fprintf(stderr,
-"%s: Pid %d exited with status %d after %d seconds\n",
-feed->filename, pid, status, uptime);
+uptime = time(0) - feed->pid_start;
+feed->pid = 0;
+fprintf(stderr,
+"%s: Pid %d exited with status %d after %d seconds\n",
+feed->filename, pid, status, uptime);
-if (uptime < 30)
-/* Turn off any more restarts */
-ffserver_free_child_args(&feed->child_argv);
-}
+if (uptime < 30)
+/* Turn off any more restarts */
+ffserver_free_child_args(&feed->child_argv);
}
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
