xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-12-18 00:58:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ffserver: formating

Browse Source 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
This commit is contained in:
Reynaldo H. Verdejo Pinochet 2015-06-21 18:19:09 -03:00
parent c70c6be225
commit d8a04d916b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ffserver.c
View File

@ -504,8 +504,7 @@ static void start_multicast(void)
random1 = av_lfg_get(&random_state); random1 = av_lfg_get(&random_state);
/* open the RTP connection */ /* open the RTP connection */
snprintf(session_id, sizeof(session_id), "%08x%08x", snprintf(session_id, sizeof(session_id), "%08x%08x", random0, random1);
random0, random1);
/* choose a port if none given */ /* choose a port if none given */
if (stream->multicast_port == 0) { if (stream->multicast_port == 0) {
@ -1166,8 +1165,10 @@ static int modify_current_stream(HTTPContext *c, char *rates)
break; 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; action_required = 1;
}
} }
return action_required; return action_required;
@ -1271,9 +1272,7 @@ static int validate_acl(FFServerStream *stream, HTTPContext *c)
if (stream->dynamic_acl[0]) { if (stream->dynamic_acl[0]) {
acl = parse_dynamic_acl(stream, c); acl = parse_dynamic_acl(stream, c);
ret = validate_acl_list(acl, c); ret = validate_acl_list(acl, c);
free_acl_list(acl); free_acl_list(acl);
} }