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>
pull/104/head
Lukasz Marek 10 years ago
parent 5dcb99033d
commit 758a66dc16
  1. 4
      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); ret = av_parse_video_size(&w, &h, arg);
if (ret < 0) if (ret < 0)
ERROR("Invalid video size '%s'\n", arg); ERROR("Invalid video size '%s'\n", arg);
else if ((w % 16) || (h % 16)) else if ((w % 2) || (h % 2))
ERROR("Image size must be a multiple of 16\n"); WARNING("Image size is not a multiple of 2\n");
if (av_dict_set_int(&config->video_conf, "VideoSizeWidth", w, 0) < 0 || if (av_dict_set_int(&config->video_conf, "VideoSizeWidth", w, 0) < 0 ||
av_dict_set_int(&config->video_conf, "VideoSizeHeight", h, 0) < 0) av_dict_set_int(&config->video_conf, "VideoSizeHeight", h, 0) < 0)
goto nomem; goto nomem;

Loading…
Cancel
Save