Merge commit '2b5c1efa1465d8646f8be525cace7a21404e40ad'

[ffmpeg] / ffserver_config.c

diff --git a/ffserver_config.c b/ffserver_config.c
index 75998d130be3107abb9b19d26e5dd36ded611d36..ac89063d8a3b6eed48c6060a480928fee1a36129 100644 (file)
--- a/ffserver_config.c
+++ b/ffserver_config.c
@@ -214,6 +214,8 @@ static void add_codec(FFServerStream *stream, AVCodecContext *av)
         av->frame_skip_cmp = FF_CMP_DCTMAX;
         if (!av->me_method)
             av->me_method = ME_EPZS;
+
+        /* FIXME: rc_buffer_aggressivity and rc_eq are deprecated */
         av->rc_buffer_aggressivity = 1.0;
 
         if (!av->rc_eq)
@@ -893,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;
@@ -1206,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)