[FFmpeg-cvslog] ffserver_config: drop requirement video size being multiple of 16

Lukasz Marek git at videolan.org
Tue Nov 11 01:05:15 CET 2014


ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki2 at gmail.com> | Sat Nov  1 03:00:52 2014 +0100| [758a66dc16eb0ef80afb7b79c13bb328da836fe9] | committer: Lukasz Marek

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=758a66dc16eb0ef80afb7b79c13bb328da836fe9
---

 ffserver_config.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ffserver_config.c b/ffserver_config.c
index c8180ef..5bb2d29 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;



More information about the ffmpeg-cvslog mailing list