[FFmpeg-devel] [PATCH 2/2] x86/blockdsp: add missing FF_API_XVMC guards

[James Almer]

On 19/06/14 8:17 AM, Michael Niedermayer wrote:
> On Thu, Jun 19, 2014 at 01:00:18AM -0300, James Almer wrote:
>> Signed-off-by: James Almer <jamrial at gmail.com>
>> ---
>>  libavcodec/x86/blockdsp_mmx.c | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/libavcodec/x86/blockdsp_mmx.c b/libavcodec/x86/blockdsp_mmx.c
>> index 7780184..8e7da22 100644
>> --- a/libavcodec/x86/blockdsp_mmx.c
>> +++ b/libavcodec/x86/blockdsp_mmx.c
>> @@ -47,9 +47,11 @@ av_cold void ff_blockdsp_init_x86(BlockDSPContext *c, unsigned high_bit_depth)
>>              c->clear_blocks = ff_clear_blocks_mmx;
>>          }
>>  
>> +#if FF_API_XVMC
>>      /* XvMCCreateBlocks() may not allocate 16-byte aligned blocks */
>>      if (CONFIG_XVMC && avctx->hwaccel && avctx->hwaccel->decode_mb)
>>          return;
>> +#endif /* FF_API_XVMC */
> 
> this looks wrong
> we have a maintainer for xvmc and he wanted to keep xvmc support IIRC
> the newly added FF_API_XVMC checks should be adapted/removed i guess
> i intended to do it when it fails to build but it sure could be
> done immedeatly
> 
> Thanks

I added them because as soon as lavc major version is bumped those checks would 
fail to compile, but if the deprecation is going to be removed at some point 
then yeah, no need for something like this i guess.