Merge commit 'c00365b46d464ce47716315c1801818d811bdb9a'

[ffmpeg] / ffserver_config.c

diff --git a/ffserver_config.c b/ffserver_config.c
index c8180ef1b79ed5dc43834b98c84f592a9b5c2ae9..ac89063d8a3b6eed48c6060a480928fee1a36129 100644 (file)
--- 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;
@@ -1208,6 +1208,8 @@ int ffserver_parse_ffconfig(const char *filename, FFServerConfig *config)
             ffserver_parse_config_global(config, cmd, &p, line_num);
         }
     }
+    if (stream || feed || redirect)
+        ERROR("Not closed tag %s\n", stream ? "<Stream>" : (feed ? "<Feed>" : "<Redirect>"));
 
     fclose(f);
     if (ret < 0)