[FFmpeg-devel] [PATCH] lavu/opt.h: add AV_OPT_FLAG_FILTERING_PARAM macro

[Stefano Sabatini]

On date Sunday 2012-08-12 14:06:17 +0200, Michael Niedermayer encoded:
> On Sun, Aug 12, 2012 at 12:26:08PM +0200, Stefano Sabatini wrote:
> > On date Sunday 2012-08-12 12:12:53 +0200, Stefano Sabatini encoded:
> > > On date Saturday 2012-08-11 13:54:20 +0200, Michael Niedermayer encoded:
> > > From 3e03efce9b5c402d46b7bd4c7dccc2e8ec032066 Mon Sep 17 00:00:00 2001
> > > From: Stefano Sabatini <stefasab at gmail.com>
> > > Date: Thu, 9 Aug 2012 16:21:07 +0200
> > > Subject: [PATCH] lavu/opt.h: add AV_OPT_FLAG_FILTERING_PARAM macro
> > > 
> > > ---
> > >  libavutil/opt.c |    1 +
> > >  libavutil/opt.h |    2 ++
> > >  2 files changed, 3 insertions(+), 0 deletions(-)
> > [...]
> > 
> > Updated with () around 1<<16.
> > -- 
> > FFmpeg = Free and Fancy Merciful Perfectionist Epic Generator
> 
> >  opt.c |    1 +
> >  opt.h |    1 +
> >  2 files changed, 2 insertions(+)
> > 2bf508a4430c8f9acc63e6d08dd050f744fdf21a  0005-lavu-opt.h-add-AV_OPT_FLAG_FILTERING_PARAM-macro.patch
> > From 3b66103ad0dae5f2d9de52749c8fbfdfc00fa21d Mon Sep 17 00:00:00 2001
> > From: Stefano Sabatini <stefasab at gmail.com>
> > Date: Thu, 9 Aug 2012 16:21:07 +0200
> > Subject: [PATCH] lavu/opt.h: add AV_OPT_FLAG_FILTERING_PARAM macro
> > 
> > TODO: add APIchanges entry and bump minor
> > ---
> >  libavutil/opt.c |    1 +
> >  libavutil/opt.h |    1 +
> >  2 files changed, 2 insertions(+), 0 deletions(-)
> > 
> > diff --git a/libavutil/opt.c b/libavutil/opt.c
> > index 02869e4..0adbddd 100644
> > --- a/libavutil/opt.c
> > +++ b/libavutil/opt.c
> > @@ -634,6 +634,7 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit,
> >          }
> >          av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_ENCODING_PARAM) ? 'E' : '.');
> >          av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_DECODING_PARAM) ? 'D' : '.');
> > +        av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_FILTERING_PARAM)? 'F' : '.');
> >          av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_VIDEO_PARAM   ) ? 'V' : '.');
> >          av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_AUDIO_PARAM   ) ? 'A' : '.');
> >          av_log(av_log_obj, AV_LOG_INFO, "%c", (opt->flags & AV_OPT_FLAG_SUBTITLE_PARAM) ? 'S' : '.');
> > diff --git a/libavutil/opt.h b/libavutil/opt.h
> > index b947814..3bf30a5 100644
> > --- a/libavutil/opt.h
> > +++ b/libavutil/opt.h
> > @@ -279,6 +279,7 @@ typedef struct AVOption {
> >  #define AV_OPT_FLAG_AUDIO_PARAM     8
> >  #define AV_OPT_FLAG_VIDEO_PARAM     16
> >  #define AV_OPT_FLAG_SUBTITLE_PARAM  32
> > +#define AV_OPT_FLAG_FILTERING_PARAM (1<<16) ///< a generic parameter which can be set by the user for filtering
> >  //FIXME think about enc-audio, ... style flags
> 
> LGTM

Applied, thanks.
-- 
FFmpeg = Foolish & Frenzy Marvellous Patchable Ecumenical Geek