highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffserver: decouple assignment and check

Browse Source 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
This commit is contained in:
Reynaldo H. Verdejo Pinochet 2015-02-15 14:54:34 -03:00
parent 50c1cac432
commit bd8e16f2e6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffserver.c
View File

@ -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)
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) */