diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2014-08-02 16:40:53 +0200 |
|---|---|---|
| committer | Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com> | 2014-08-17 22:51:45 -0400 |
| commit | 1013d8dd6967f1e776c08dc133ed6ae44ca3dc64 (patch) | |
| tree | 4bc27ceb9353b8c674db8f94323eb252b7a3a824 /ffserver.c | |
| parent | 96d217832598da7001bc204706476dd1e37f377e (diff) | |
| download | ffmpeg-1013d8dd6967f1e776c08dc133ed6ae44ca3dc64.tar.gz | |
ffserver: deprecate Port and BindAddress options in favor of HTTPPort and HTTPBindAddress
The new option names are more explicit.
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ffserver.c b/ffserver.c index 8acc0401ae..57ebfeb3c5 100644 --- a/ffserver.c +++ b/ffserver.c @@ -4081,14 +4081,18 @@ static int parse_ffconfig(const char *filename) get_arg(cmd, sizeof(cmd), &p); - if (!av_strcasecmp(cmd, "Port")) { + if (!av_strcasecmp(cmd, "Port") || !av_strcasecmp(cmd, "HTTPPort")) { + if (!av_strcasecmp(cmd, "Port")) + WARNING("Port option is deprecated, use HTTPPort instead\n"); get_arg(arg, sizeof(arg), &p); val = atoi(arg); if (val < 1 || val > 65536) { - ERROR("Invalid_port: %s\n", arg); + ERROR("Invalid port: %s\n", arg); } my_http_addr.sin_port = htons(val); - } else if (!av_strcasecmp(cmd, "BindAddress")) { + } else if (!av_strcasecmp(cmd, "HTTPBindAddress") || !av_strcasecmp(cmd, "BindAddress")) { + if (!av_strcasecmp(cmd, "BindAddress")) + WARNING("BindAddress option is deprecated, use HTTPBindAddress instead\n"); get_arg(arg, sizeof(arg), &p); if (resolve_host(&my_http_addr.sin_addr, arg) != 0) { ERROR("%s:%d: Invalid host/IP address: %s\n", arg); |