summaryrefslogtreecommitdiffstats
path: root/ffserver.c
diff options
context:
space:
mode:
authorReynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>2015-06-21 18:19:09 -0300
committerReynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>2015-06-21 19:06:00 -0300
commitd8a04d916b24b892ed0f86963598876085929a15 (patch)
tree14cc32a3a2912da3c4a2563b617c550b4afbee64 /ffserver.c
parentc70c6be2259759b75c1b1dc7d68a0cf172f2cab8 (diff)
downloadffmpeg-streaming-d8a04d916b24b892ed0f86963598876085929a15.zip
ffmpeg-streaming-d8a04d916b24b892ed0f86963598876085929a15.tar.gz
ffserver: formating
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/ffserver.c b/ffserver.c
index 2b19bba..8687eba 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -504,8 +504,7 @@ static void start_multicast(void)
random1 = av_lfg_get(&random_state);
/* open the RTP connection */
- snprintf(session_id, sizeof(session_id), "%08x%08x",
- random0, random1);
+ snprintf(session_id, sizeof(session_id), "%08x%08x", random0, random1);
/* choose a port if none given */
if (stream->multicast_port == 0) {
@@ -1166,8 +1165,10 @@ static int modify_current_stream(HTTPContext *c, char *rates)
break;
}
- if (c->switch_feed_streams[i] >= 0 && c->switch_feed_streams[i] != c->feed_streams[i])
+ if (c->switch_feed_streams[i] >= 0 &&
+ c->switch_feed_streams[i] != c->feed_streams[i]) {
action_required = 1;
+ }
}
return action_required;
@@ -1271,9 +1272,7 @@ static int validate_acl(FFServerStream *stream, HTTPContext *c)
if (stream->dynamic_acl[0]) {
acl = parse_dynamic_acl(stream, c);
-
ret = validate_acl_list(acl, c);
-
free_acl_list(acl);
}
OpenPOWER on IntegriCloud