aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukasz Marek <lukasz.m.luki2@gmail.com>2014-11-01 03:00:52 +0100
committerLukasz Marek <lukasz.m.luki2@gmail.com>2014-11-11 01:04:59 +0100
commit758a66dc16eb0ef80afb7b79c13bb328da836fe9 (patch)
tree085891c421097e02d1356d380e6beaaab12dd4b1
parent5dcb99033df16eccc4dbbc4a099ad64457f9f090 (diff)
downloadffmpeg-758a66dc16eb0ef80afb7b79c13bb328da836fe9.tar.gz
ffserver_config: drop requirement video size being multiple of 16
Such strong requirement constraint doesn't allow to use 360p. Changed to warning when video size is not being multiple of 2. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
-rw-r--r--ffserver_config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffserver_config.c b/ffserver_config.c
index c8180ef1b7..5bb2d2981f 100644
--- a/ffserver_config.c
+++ b/ffserver_config.c
@@ -895,8 +895,8 @@ static int ffserver_parse_config_stream(FFServerConfig *config, const char *cmd,
ret = av_parse_video_size(&w, &h, arg);
if (ret < 0)
ERROR("Invalid video size '%s'\n", arg);
- else if ((w % 16) || (h % 16))
- ERROR("Image size must be a multiple of 16\n");
+ else if ((w % 2) || (h % 2))
+ WARNING("Image size is not a multiple of 2\n");
if (av_dict_set_int(&config->video_conf, "VideoSizeWidth", w, 0) < 0 ||
av_dict_set_int(&config->video_conf, "VideoSizeHeight", h, 0) < 0)
goto nomem;