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

[Vittorio Giovara]

On Wed, Sep 28, 2016 at 8:10 AM, Tristan Matthews <tmatth at videolan.org> 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...
>
>> +#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

Yeah, vpx_codec_vp9_dx() is the right call for decoders (I should have
use that, sorry)
-- 
Vittorio