[libav-devel] [PATCH 6/6] avconv: add support for VDPAU decoding

Diego Biurrun diego at biurrun.de
Sat Nov 9 13:33:55 CET 2013


On Mon, Nov 04, 2013 at 07:56:54AM +0100, Anton Khirnov wrote:
> 
> On Mon, 4 Nov 2013 01:40:29 +0100, Diego Biurrun <diego at biurrun.de> wrote:
> > On Sun, Nov 03, 2013 at 11:27:50PM +0100, Anton Khirnov wrote:
> > > --- a/avconv.h
> > > +++ b/avconv.h
> > > @@ -386,4 +387,8 @@ FilterGraph *init_simple_filtergraph(InputStream *ist, OutputStream *ost);
> > >  
> > >  int avconv_parse_options(int argc, char **argv);
> > >  
> > > +#if HAVE_VDPAU_X11
> > > +int vdpau_init(AVCodecContext *s);
> > > +#endif
> > 
> > This is a harmless declaration, no need for the ifdef.
> > 
> > > --- a/configure
> > > +++ b/configure
> > > @@ -3890,15 +3892,21 @@ if enabled libcdio; then
> > >  
> > > +check_lib X11/Xlib.h XOpenDisplay -lX11 && enable xlib
> > > +
> > >  enabled x11grab                                           &&
> > > -require X11 X11/Xlib.h XOpenDisplay -lX11                 &&
> > >  require Xext X11/extensions/XShm.h XShmCreateImage -lXext &&
> > > -require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage -lXfixes
> > > +require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage -lXfixes &&
> > > +{ enabled xlib || die "ERROR: Xlib not found"; }
> > 
> > Why do you add the error message?
> 
> Would you prefer me to check for xlib twice?
> 
> Xlib (but not Xext or Xfixes) is needed both for x11grab and vdpau, so I'm just
> factoring the check for it out.

You are also adding an error message and changing behavior.  Before,
configure did not exit upon failing to enable x11grab.

Diego


More information about the libav-devel mailing list