Merge commit 'f56a08559334b7eb6b3fedbc0cc741887f6067ae'

[ffmpeg] / ffserver_config.c

diff --git a/ffserver_config.c b/ffserver_config.c
index dbfda8d1ba4a1255ef91bec2bb429bde3b97bd65..691ff7b49ec5a9272ea8fde3f565aea94fcb92f8 100644 (file)
--- a/ffserver_config.c
+++ b/ffserver_config.c
@@ -685,8 +685,8 @@ static int ffserver_parse_config_global(FFServerConfig *config, const char *cmd,
     return 0;
 }
 
-static int ffserver_parse_config_feed(FFServerConfig *config, const char *cmd, const char **p,
-                                      FFServerStream **pfeed)
+static int ffserver_parse_config_feed(FFServerConfig *config, const char *cmd,
+                                      const char **p, FFServerStream **pfeed)
 {
     FFServerStream *feed;
     char arg[1024];
@@ -793,7 +793,8 @@ static int ffserver_parse_config_feed(FFServerConfig *config, const char *cmd, c
     return 0;
 }
 
-static int ffserver_parse_config_stream(FFServerConfig *config, const char *cmd, const char **p,
+static int ffserver_parse_config_stream(FFServerConfig *config, const char *cmd,
+                                        const char **p,
                                         FFServerStream **pstream)
 {
     char arg[1024], arg2[1024];