Skip to content
Snippets Groups Projects
Commit bd8e16f2 authored by Reynaldo H. Verdejo Pinochet's avatar Reynaldo H. Verdejo Pinochet
Browse files

ffserver: decouple assignment and check

parent 50c1cac4
No related branches found
No related tags found
No related merge requests found
...@@ -2052,7 +2052,9 @@ static int open_input_stream(HTTPContext *c, const char *info) ...@@ -2052,7 +2052,9 @@ static int open_input_stream(HTTPContext *c, const char *info)
} }
/* open stream */ /* 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)); http_log("Could not open input '%s': %s\n", input_filename, av_err2str(ret));
return ret; return ret;
} }
...@@ -3504,7 +3506,9 @@ static void build_file_streams(void) ...@@ -3504,7 +3506,9 @@ static void build_file_streams(void)
http_log("Opening feed file '%s' for stream '%s'\n", http_log("Opening feed file '%s' for stream '%s'\n",
stream->feed_filename, stream->filename); 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, http_log("Could not open '%s': %s\n", stream->feed_filename,
av_err2str(ret)); av_err2str(ret));
/* remove stream (no need to spend more time on it) */ /* remove stream (no need to spend more time on it) */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment