From 950b3589974e55888fc37369f2d9216a18c1ca84 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Thu, 19 May 2011 21:41:50 +0200 Subject: [PATCH] cmdutils: use const AVClass * when senseful MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix warnings: cmdutils.c: In function ‘opt_default’: cmdutils.c:304: warning: initialization discards qualifiers from pointer target type cmdutils.c: In function ‘set_context_opts’: cmdutils.c:431: warning: passing argument 2 of ‘alloc_priv_context’ discards qualifiers from pointer target type cmdutils.c:414: note: expected ‘struct AVClass *’ but argument is of type ‘const struct AVClass *’ --- cmdutils.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmdutils.c b/cmdutils.c index 71d6d33454..5a0c8f378f 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -301,7 +301,7 @@ int opt_default(const char *opt, const char *arg){ AVInputFormat *iformat = NULL; while ((p = av_codec_next(p))) { - AVClass *c = p->priv_class; + const AVClass *c = p->priv_class; if (c && av_find_opt(&c, opt, NULL, 0, 0)) break; } @@ -411,10 +411,11 @@ int opt_timelimit(const char *opt, const char *arg) return 0; } -static void *alloc_priv_context(int size, AVClass *class){ +static void *alloc_priv_context(int size, const AVClass *class) +{ void *p = av_mallocz(size); if (p) { - *(AVClass**)p = class; + *(const AVClass **)p = class; av_opt_set_defaults(p); } return p;