git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5dcb990
)
ffserver_config: drop requirement video size being multiple of 16
author
Lukasz Marek
<lukasz.m.luki2@gmail.com>
Sat, 1 Nov 2014 02:00:52 +0000
(
03:00
+0100)
committer
Lukasz Marek
<lukasz.m.luki2@gmail.com>
Tue, 11 Nov 2014 00:04:59 +0000
(
01:04
+0100)
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>
ffserver_config.c
patch
|
blob
|
history
diff --git
a/ffserver_config.c
b/ffserver_config.c
index
c8180ef
..
5bb2d29
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;