[FFmpeg-devel] [PATCH 13/16] lavc: Remove old vaapi decode infrastructure

[Mark Thompson]

On 09/01/17 00:33, Michael Niedermayer wrote:
> On Sun, Jan 08, 2017 at 06:14:25PM +0000, Mark Thompson wrote:
> [...]
> 
>> diff --git a/libavcodec/vaapi.h b/libavcodec/vaapi.h
>> index 7a29f6f881..ab6110ba9c 100644
>> --- a/libavcodec/vaapi.h
>> +++ b/libavcodec/vaapi.h
>> @@ -34,6 +34,12 @@
>>  #include "libavutil/attributes.h"
>>  #include "version.h"
>>  
>> +#include "libavutil/attributes.h"
>> +
>> +#include "version.h"
> 
> are you sure this is needed twice? ;)

Removed locally.

Looking at this again, I can see the merge also lost the deletion of the now-unused files vaapi.c and vaapi_internal.h, so I've added that back in at the same time.

Merging is fun :)

Thanks,

- Mark