[FFmpeg-devel] [PATCH 2/2] avfilter/vf_mergeplanes: specify pixel format min/max

[Michael Niedermayer]

On Sat, Dec 07, 2013 at 09:53:04PM +0100, Paul B Mahol wrote:
> On 12/7/13, Michael Niedermayer <michaelni at gmx.at> wrote:
> > Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> > ---
> >  libavfilter/vf_mergeplanes.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/libavfilter/vf_mergeplanes.c b/libavfilter/vf_mergeplanes.c
> > index 06a17fb..4a81412 100644
> > --- a/libavfilter/vf_mergeplanes.c
> > +++ b/libavfilter/vf_mergeplanes.c
> > @@ -53,7 +53,7 @@ typedef struct MergePlanesContext {
> >  #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
> >  static const AVOption mergeplanes_options[] = {
> >      { "mapping", "set input to output plane mapping", OFFSET(mapping),
> > AV_OPT_TYPE_INT, {.i64=0}, 0, 0x33333333, FLAGS },
> > -    { "format", "set output pixel format", OFFSET(out_fmt),
> > AV_OPT_TYPE_PIXEL_FMT, {.i64=AV_PIX_FMT_YUVA444P}, .flags=FLAGS },
> > +    { "format", "set output pixel format", OFFSET(out_fmt),
> > AV_OPT_TYPE_PIXEL_FMT, {.i64=AV_PIX_FMT_YUVA444P}, 0, AV_PIX_FMT_NB-1,
> > .flags=FLAGS },
> >      { NULL }
> >  };
> >
> > --
> > 1.7.9.5
> >
> > _______________________________________________
> > ffmpeg-devel mailing list
> > ffmpeg-devel at ffmpeg.org
> > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >
> ok

applied

thanks

[...]
--
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The greatest way to live with honor in this world is to be what we pretend
to be. -- Socrates
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20131208/873bd2e2/attachment.asc>