[vlc-devel] [PATCH] vpx: Fix --disable-sout builds

[Thomas Guillem]

On Wed, Sep 28, 2016, at 14:10, Tristan Matthews wrote:
> Hi,
> 
> On Wed, Sep 28, 2016 at 4:27 AM, Hugo Beauzée-Luyssen <hugo at beauzee.fr>
> wrote:
> > There might be a better fix though
> > ---
> >  modules/codec/vpx.c | 7 ++-----
> >  1 file changed, 2 insertions(+), 5 deletions(-)
> >
> > diff --git a/modules/codec/vpx.c b/modules/codec/vpx.c
> > index ebee86b..49754f1 100644
> > --- a/modules/codec/vpx.c
> > +++ b/modules/codec/vpx.c
> > @@ -33,11 +33,8 @@
> >
> >  #include <vpx/vpx_decoder.h>
> >  #include <vpx/vp8dx.h>
> > -
> > -#ifdef ENABLE_SOUT
> > -# include <vpx/vpx_encoder.h>
> > -# include <vpx/vp8cx.h>
> > -#endif
> > +#include <vpx/vpx_encoder.h>
> 
> I don't think that moving this can be avoided, due to
> VPX_CODEC_CAP_HIGHBITDEPTH, but...

if contribs are build without sout support, vpx/vpx_encoder.h won't be
installed.

Should this line
"if( img->bit_depth > 8 && !(codec_caps & VPX_CODEC_CAP_HIGHBITDEPTH) )"
be surrounded with #ifdef ENABLE_SOUT ?


> 
> > +#include <vpx/vp8cx.h>
> 
> moving this can be avoided if you change the line:
> 
> codec_caps = vpx_codec_get_caps(vpx_codec_vp9_cx());
> 
> to
> 
> codec_caps = vpx_codec_get_caps(vpx_codec_vp9_dx());
> 
> Best,
> Tristan
> 
> >
> >  /****************************************************************************
> >   * Local prototypes
> > --
> > 2.9.3
> >
> > _______________________________________________
> > vlc-devel mailing list
> > To unsubscribe or modify your subscription options:
> > https://mailman.videolan.org/listinfo/vlc-devel
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel