[FFmpeg-cvslog] ffserver: drop unneeded else branching
Reynaldo H. Verdejo Pinochet
git at videolan.org
Mon Jun 22 00:06:25 CEST 2015
ffmpeg | branch: master | Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com> | Sun Jun 21 18:57:13 2015 -0300| [6504047f82866fdc0e2a5422ad7fecb44740e9d6] | committer: Reynaldo H. Verdejo Pinochet
ffserver: drop unneeded else branching
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo at osg.samsung.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6504047f82866fdc0e2a5422ad7fecb44740e9d6
---
ffserver.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ffserver.c b/ffserver.c
index 2de35ba..fd7d3cb 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2217,7 +2217,8 @@ static int http_prepare_data(HTTPContext *c)
ffm file, so must wait for more data */
c->state = HTTPSTATE_WAIT_FEED;
return 1; /* state changed */
- } else if (ret == AVERROR(EAGAIN)) {
+ }
+ if (ret == AVERROR(EAGAIN)) {
/* input not ready, come back later */
return 0;
}
More information about the ffmpeg-cvslog
mailing list