On Sat, Oct 3, 2015 at 7:42 AM, Ronald S. Bultje <rsbul...@gmail.com> wrote: > Hi, > > On Sat, Oct 3, 2015 at 8:39 AM, Ganesh Ajjanagadde <gajjanaga...@gmail.com> > wrote: >> >> On Sat, Sep 26, 2015 at 9:57 AM, Ganesh Ajjanagadde >> <gajjanaga...@gmail.com> wrote: >> > On Sat, Sep 19, 2015 at 10:20 AM, Ganesh Ajjanagadde >> > <gajjanaga...@gmail.com> wrote: >> >> This patch silences such warnings by placing initializations under a >> >> header guard, >> >> see e.g >> >> >> >> http://fate.ffmpeg.org/log.cgi?time=20150919095430&log=compile&slot=x86_64-archlinux-gcc-disableswscale, >> >> >> >> http://fate.ffmpeg.org/log.cgi?time=20150919095048&log=compile&slot=x86_64-archlinux-gcc-disableswresample >> >> for examples of such warnings. >> >> It also has the benefit of placing library specific #defines next to >> >> each other. >> >> >> >> Signed-off-by: Ganesh Ajjanagadde <gajjanaga...@gmail.com> >> >> --- >> >> cmdutils.c | 9 ++++++--- >> >> 1 file changed, 6 insertions(+), 3 deletions(-) >> >> >> >> diff --git a/cmdutils.c b/cmdutils.c >> >> index b696008..38d6334 100644 >> >> --- a/cmdutils.c >> >> +++ b/cmdutils.c >> >> @@ -533,7 +533,12 @@ int opt_default(void *optctx, const char *opt, >> >> const char *arg) >> >> #if CONFIG_AVRESAMPLE >> >> const AVClass *rc = avresample_get_class(); >> >> #endif >> >> - const AVClass *sc, *swr_class; >> >> +#if CONFIG_SWSCALE >> >> + const AVClass *sc = sws_get_class(); >> >> +#endif >> >> +#if CONFIG_SWRESAMPLE >> >> + const AVClass *swr_class = swr_get_class(); >> >> +#endif >> >> >> >> if (!strcmp(opt, "debug") || !strcmp(opt, "fdebug")) >> >> av_log_set_level(AV_LOG_DEBUG); >> >> @@ -557,7 +562,6 @@ int opt_default(void *optctx, const char *opt, >> >> const char *arg) >> >> consumed = 1; >> >> } >> >> #if CONFIG_SWSCALE >> >> - sc = sws_get_class(); >> >> if (!consumed && (o = opt_find(&sc, opt, NULL, 0, >> >> AV_OPT_SEARCH_CHILDREN | >> >> AV_OPT_SEARCH_FAKE_OBJ))) { >> >> struct SwsContext *sws = sws_alloc_context(); >> >> @@ -579,7 +583,6 @@ int opt_default(void *optctx, const char *opt, >> >> const char *arg) >> >> } >> >> #endif >> >> #if CONFIG_SWRESAMPLE >> >> - swr_class = swr_get_class(); >> >> if (!consumed && (o=opt_find(&swr_class, opt, NULL, 0, >> >> AV_OPT_SEARCH_CHILDREN | >> >> AV_OPT_SEARCH_FAKE_OBJ))) { >> >> struct SwrContext *swr = swr_alloc(); >> >> -- >> >> 2.5.2 >> >> >> > >> > ping >> >> been a week; hence ping again. > > > Patch is fine with me. Do you have commit access?
Technically I do, but some devs are not comfortable with me exercising it at the moment. I plan to exercise it only when there are no objections from anyone. As such, at the moment, please continue to push my patches. > > Ronald _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
