aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>2014-11-16 20:12:29 -0300
committerReynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>2014-11-16 20:25:55 -0300
commit33d6f90e3e0241939ea0be9ca9e1f335942081c8 (patch)
treeae0f3cb374989db25da512af76333ba9c8df1107
parent20bf91f8322ff263a5e74edf8e527707f2c65df0 (diff)
downloadffmpeg-33d6f90e3e0241939ea0be9ca9e1f335942081c8.tar.gz
ffserver: drop pointless explicit !=0 checks
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
-rw-r--r--ffserver.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ffserver.c b/ffserver.c
index ea2a2aeb67..933eb0ec61 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -1355,7 +1355,7 @@ static int http_parse_request(HTTPContext *c)
redir_type = REDIR_ASX;
filename[strlen(filename)-1] = 'f';
} else if (av_match_ext(filename, "asf") &&
- (!useragent || av_strncasecmp(useragent, "NSPlayer", 8) != 0)) {
+ (!useragent || av_strncasecmp(useragent, "NSPlayer", 8))) {
/* if this isn't WMP or lookalike, return the redirector file */
redir_type = REDIR_ASF;
} else if (av_match_ext(filename, "rpm,ram")) {
@@ -2303,7 +2303,7 @@ static int http_send_data(HTTPContext *c)
ret = http_prepare_data(c);
if (ret < 0)
return -1;
- else if (ret != 0)
+ else if (ret)
/* state change requested */
break;
} else {
@@ -2686,7 +2686,7 @@ static int rtsp_parse_request(HTTPContext *c)
}
/* check version name */
- if (strcmp(protocol, "RTSP/1.0") != 0) {
+ if (strcmp(protocol, "RTSP/1.0")) {
rtsp_reply_error(c, RTSP_STATUS_VERSION);
goto the_end;
}