Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
d8a04d91
Commit
d8a04d91
authored
Jun 21, 2015
by
Reynaldo H. Verdejo Pinochet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffserver: formating
Signed-off-by:
Reynaldo H. Verdejo Pinochet
<
reynaldo@osg.samsung.com
>
parent
c70c6be2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
ffserver.c
ffserver.c
+4
-5
No files found.
ffserver.c
View file @
d8a04d91
...
...
@@ -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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment