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
bd8e16f2
Commit
bd8e16f2
authored
Feb 15, 2015
by
Reynaldo H. Verdejo Pinochet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffserver: decouple assignment and check
Signed-off-by:
Reynaldo H. Verdejo Pinochet
<
reynaldo@osg.samsung.com
>
parent
50c1cac4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
ffserver.c
ffserver.c
+6
-2
No files found.
ffserver.c
View file @
bd8e16f2
...
...
@@ -2052,7 +2052,9 @@ static int open_input_stream(HTTPContext *c, const char *info)
}
/* open stream */
if
((
ret
=
avformat_open_input
(
&
s
,
input_filename
,
c
->
stream
->
ifmt
,
&
c
->
stream
->
in_opts
))
<
0
)
{
ret
=
avformat_open_input
(
&
s
,
input_filename
,
c
->
stream
->
ifmt
,
&
c
->
stream
->
in_opts
);
if
(
ret
<
0
)
{
http_log
(
"Could not open input '%s': %s
\n
"
,
input_filename
,
av_err2str
(
ret
));
return
ret
;
}
...
...
@@ -3504,7 +3506,9 @@ static void build_file_streams(void)
http_log
(
"Opening feed file '%s' for stream '%s'
\n
"
,
stream
->
feed_filename
,
stream
->
filename
);
if
((
ret
=
avformat_open_input
(
&
infile
,
stream
->
feed_filename
,
stream
->
ifmt
,
&
stream
->
in_opts
))
<
0
)
{
ret
=
avformat_open_input
(
&
infile
,
stream
->
feed_filename
,
stream
->
ifmt
,
&
stream
->
in_opts
);
if
(
ret
<
0
)
{
http_log
(
"Could not open '%s': %s
\n
"
,
stream
->
feed_filename
,
av_err2str
(
ret
));
/* remove stream (no need to spend more time on it) */
...
...
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