virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

ffserver: drop pointless explicit !=0 checks

Browse Source 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
This commit is contained in:
Reynaldo H. Verdejo Pinochet
2014-11-16 20:12:29 -03:00
parent 20bf91f832
commit 33d6f90e3e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ffserver.c
View File

@@ -1355,7 +1355,7 @@ static int http_parse_request(HTTPContext *c)
redir_type = REDIR_ASX; redir_type = REDIR_ASX;
filename[strlen(filename)-1] = 'f'; filename[strlen(filename)-1] = 'f';
} else if (av_match_ext(filename, "asf") && } 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 */ /* if this isn't WMP or lookalike, return the redirector file */
redir_type = REDIR_ASF; redir_type = REDIR_ASF;
} else if (av_match_ext(filename, "rpm,ram")) { } else if (av_match_ext(filename, "rpm,ram")) {
@@ -2303,7 +2303,7 @@ static int http_send_data(HTTPContext *c)
ret = http_prepare_data(c); ret = http_prepare_data(c);
if (ret < 0) if (ret < 0)
return -1; return -1;
else if (ret != 0) else if (ret)
/* state change requested */ /* state change requested */
break; break;
} else { } else {
@@ -2686,7 +2686,7 @@ static int rtsp_parse_request(HTTPContext *c)
} }
/* check version name */ /* check version name */
if (strcmp(protocol, "RTSP/1.0") != 0) { if (strcmp(protocol, "RTSP/1.0")) {
rtsp_reply_error(c, RTSP_STATUS_VERSION); rtsp_reply_error(c, RTSP_STATUS_VERSION);
goto the_end; goto the_end;
} }