On 18.11.2014 21:35, Reynaldo H. Verdejo Pinochet wrote:
Hi
On 11/16/2014 10:46 PM, Lukasz Marek wrote:
Signed-off-by: Lukasz Marek <lukasz.m.lu...@gmail.com>
[..]
@@ -965,43 +881,38 @@ 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 % 2) || (h % 2))
See bellow
- 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;
- } else if (!av_strcasecmp(cmd, "VideoFrameRate")) {
- AVRational frame_rate;
- ffserver_get_arg(arg, sizeof(arg), p);
- if (av_parse_video_rate(&frame_rate, arg) < 0) {
- ERROR("Incorrect frame rate: %s\n", arg);
- } else {
- if (av_dict_set_int(&config->video_conf, "VideoFrameRateNum",
frame_rate.num, 0) < 0 ||
- av_dict_set_int(&config->video_conf, "VideoFrameRateDen",
frame_rate.den, 0) < 0)
+ else {
+ if ((w % 2) || (h % 2))
Drop the redundant () across %.
This part is not part of the commit, but I will remove.
Also, please make an effort
to break lines at 80 chars as long as it doesn't make the
code harder to read. This seems particularly possible on the
function declarations.
regarding this part, I set my editor to notice 90 chars and I try to
respect that, but with some reasonable margin. TBH, 80 chars is
prehistoric, probably from the era of crt's with text mode.
I don't remember official ffmpeg's rules about that, but common, its
21th century...
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
