[FFmpeg-cvslog] ffserver: decouple assignment and check

[Reynaldo H. Verdejo Pinochet]

ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com> | Sun Feb 15 14:54:34 2015 -0300| [bd8e16f2e6f069dd8f63b5c22821b581ffe3151a] | committer: Reynaldo H. Verdejo Pinochet

ffserver: decouple assignment and check

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd8e16f2e6f069dd8f63b5c22821b581ffe3151a
---

 ffserver.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ffserver.c b/ffserver.c
index d19da7b..b3fb6c5 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) */