[FFmpeg-devel] [PATCH 05/11] ffserver: allow skip setting defaults

Reynaldo H. Verdejo Pinochet reynaldo at osg.samsung.com
Mon Nov 24 04:39:12 CET 2014


Hi

On 11/21/2014 09:13 PM, Lukasz Marek wrote:
> [...]
> @@ -1032,6 +1059,14 @@ static int ffserver_parse_config_stream(FFServerConfig *config, const char *cmd,
>      } else if (!av_strcasecmp(cmd, "File") || !av_strcasecmp(cmd, "ReadOnlyFile")) {
>          ffserver_get_arg(stream->feed_filename, sizeof(stream->feed_filename),
>                  p);
> +    } else if (!av_strcasecmp(cmd, "UseDefaults")) {
> +        if (config->stream_use_defaults > 1)
> +            ERROR("Multiple UseDefaults/NoDefaults entries.\n");
> +        config->stream_use_defaults = 3;
> +    } else if (!av_strcasecmp(cmd, "NoDefaults")) {
> +        if (config->stream_use_defaults > 1)
> +            ERROR("Multiple UseDefaults/NoDefaults entries.\n");
> +        config->stream_use_defaults = 2;
>      } else {
>          ERROR("Invalid entry '%s' inside <Stream></Stream>\n", cmd);
>      }

I think these should be WARNING()s. Patch looks good otherwise.

Bests,

-- 
Reynaldo H. Verdejo Pinochet
Open Source Group
Samsung Research America / Silicon Valley


More information about the ffmpeg-devel mailing list