diff options
| author | Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com> | 2015-02-15 14:54:34 -0300 |
|---|---|---|
| committer | Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com> | 2015-02-15 15:15:41 -0300 |
| commit | bd8e16f2e6f069dd8f63b5c22821b581ffe3151a (patch) | |
| tree | 1e58601196fde06452a2164e8ede06202eaa6ea0 /ffserver.c | |
| parent | 50c1cac4324fdd6b22d2d59ebd7842141f8f6461 (diff) | |
| download | ffmpeg-bd8e16f2e6f069dd8f63b5c22821b581ffe3151a.tar.gz | |
ffserver: decouple assignment and check
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ffserver.c b/ffserver.c index d19da7bb01..b3fb6c5593 100644 --- a/ffserver.c +++ b/ffserver.c @@ -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) */ |