[FFmpeg-cvslog] ffserver: drop unneeded branching

Reynaldo H. Verdejo Pinochet git at videolan.org
Sat Sep 26 02:18:22 CEST 2015


ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com> | Fri Sep 25 11:04:25 2015 -0700| [086718e8f783889dd1d13c4ade51b6babd327521] | committer: Reynaldo H. Verdejo Pinochet

ffserver: drop unneeded branching

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

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

 ffserver_config.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ffserver_config.c b/ffserver_config.c
index 06d9700..dbfda8d 100644
--- a/ffserver_config.c
+++ b/ffserver_config.c
@@ -137,8 +137,9 @@ void ffserver_parse_acl_row(FFServerStream *stream, FFServerStream* feed,
                 "%s:%d: ACL refers to invalid host or IP address '%s'\n",
                 filename, line_num, arg);
         goto bail;
-    } else
-        acl.last = acl.first;
+    }
+
+    acl.last = acl.first;
 
     ffserver_get_arg(arg, sizeof(arg), &p);
 



More information about the ffmpeg-cvslog mailing list