diff options
| author | Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com> | 2014-11-02 21:56:04 -0300 |
|---|---|---|
| committer | Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com> | 2014-11-02 22:05:54 -0300 |
| commit | 17cc78505c336fddc68a6d29fc0bdc9051271012 (patch) | |
| tree | 8830fb4ea7a3a33e1d80d683cec5e6110753b3bf /ffserver_config.c | |
| parent | 200270cc8b2879ef05d534d9cb2ab513f0e0a1c1 (diff) | |
| download | ffmpeg-17cc78505c336fddc68a6d29fc0bdc9051271012.tar.gz | |
ffserver_config: simplify some if true conditions
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Diffstat (limited to 'ffserver_config.c')
| -rw-r--r-- | ffserver_config.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ffserver_config.c b/ffserver_config.c index cb5649e28c..75998d130b 100644 --- a/ffserver_config.c +++ b/ffserver_config.c @@ -119,7 +119,7 @@ void ffserver_parse_acl_row(FFServerStream *stream, FFServerStream* feed, ffserver_get_arg(arg, sizeof(arg), &p); - if (resolve_host(&acl.first, arg) != 0) { + if (resolve_host(&acl.first, arg)) { fprintf(stderr, "%s:%d: ACL refers to invalid host or IP address '%s'\n", filename, line_num, arg); errors++; @@ -129,7 +129,7 @@ void ffserver_parse_acl_row(FFServerStream *stream, FFServerStream* feed, ffserver_get_arg(arg, sizeof(arg), &p); if (arg[0]) { - if (resolve_host(&acl.last, arg) != 0) { + if (resolve_host(&acl.last, arg)) { fprintf(stderr, "%s:%d: ACL refers to invalid host or IP address '%s'\n", filename, line_num, arg); @@ -451,7 +451,7 @@ static int ffserver_parse_config_global(FFServerConfig *config, const char *cmd, if (!av_strcasecmp(cmd, "BindAddress")) WARNING("BindAddress option is deprecated, use HTTPBindAddress instead\n"); ffserver_get_arg(arg, sizeof(arg), p); - if (resolve_host(&config->http_addr.sin_addr, arg) != 0) + if (resolve_host(&config->http_addr.sin_addr, arg)) ERROR("Invalid host/IP address: %s\n", arg); } else if (!av_strcasecmp(cmd, "NoDaemon")) { WARNING("NoDaemon option has no effect, you should remove it\n"); @@ -462,7 +462,7 @@ static int ffserver_parse_config_global(FFServerConfig *config, const char *cmd, config->rtsp_addr.sin_port = htons(val); } else if (!av_strcasecmp(cmd, "RTSPBindAddress")) { ffserver_get_arg(arg, sizeof(arg), p); - if (resolve_host(&config->rtsp_addr.sin_addr, arg) != 0) + if (resolve_host(&config->rtsp_addr.sin_addr, arg)) ERROR("Invalid host/IP address: %s\n", arg); } else if (!av_strcasecmp(cmd, "MaxHTTPConnections")) { ffserver_get_arg(arg, sizeof(arg), p); @@ -1020,7 +1020,7 @@ static int ffserver_parse_config_stream(FFServerConfig *config, const char *cmd, stream->rtsp_option = av_strdup(arg); } else if (!av_strcasecmp(cmd, "MulticastAddress")) { ffserver_get_arg(arg, sizeof(arg), p); - if (resolve_host(&stream->multicast_ip, arg) != 0) + if (resolve_host(&stream->multicast_ip, arg)) ERROR("Invalid host/IP address: %s\n", arg); stream->is_multicast = 1; stream->loop = 1; /* default is looping */ @@ -1037,7 +1037,7 @@ static int ffserver_parse_config_stream(FFServerConfig *config, const char *cmd, } else if (!av_strcasecmp(cmd, "NoLoop")) { stream->loop = 0; } else if (!av_strcasecmp(cmd, "</Stream>")) { - if (stream->feed && stream->fmt && strcmp(stream->fmt->name, "ffm") != 0) { + if (stream->feed && stream->fmt && strcmp(stream->fmt->name, "ffm")) { if (config->audio_id != AV_CODEC_ID_NONE) { AVCodecContext *audio_enc = avcodec_alloc_context3(avcodec_find_encoder(config->audio_id)); if (config->audio_preset && |