[vlc-devel] [vlc-commits] DxVA: fix compilation after backport

[Steve Lhomme]

Le 19/01/2018 à 13:17, Hugo Beauzée-Luyssen a écrit :
> On Fri, Jan 19, 2018, at 1:10 PM, Jean-Baptiste Kempf wrote:
>> vlc/vlc-3.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> |
>> Fri Jan 19 13:10:06 2018 +0100|
>> [92c10217afaec03941c2794bbf1ac4b2f6dc9cb6] | committer: Jean-Baptiste
>> Kempf
>>
>> DxVA: fix compilation after backport
>>
>>> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=92c10217afaec03941c2794bbf1ac4b2f6dc9cb6
>> ---
>>
>>   modules/hw/d3d9/dxa9.c | 7 +++++++
>>   1 file changed, 7 insertions(+)
>>
>> diff --git a/modules/hw/d3d9/dxa9.c b/modules/hw/d3d9/dxa9.c
>> index bbff337dbf..69377467ae 100644
>> --- a/modules/hw/d3d9/dxa9.c
>> +++ b/modules/hw/d3d9/dxa9.c
>> @@ -68,6 +68,13 @@ static bool GetLock(filter_t *p_filter,
>> LPDIRECT3DSURFACE9 d3d,
>>       return true;
>>   }
>>   
>> +static inline void plane_SwapUV(plane_t p[PICTURE_PLANE_MAX])
>> +{
>> +    uint8_t *buf = p[V_PLANE].p_pixels;
>> +    p[V_PLANE].p_pixels = p[U_PLANE].p_pixels;
>> +    p[U_PLANE].p_pixels = buf;
>> +}
>> +
>>   static void DXA9_YV12(filter_t *p_filter, picture_t *src, picture_t *dst)
>>   {
>>       copy_cache_t *p_copy_cache = (copy_cache_t*) p_filter->p_sys;
>>
>> _______________________________________________
>> vlc-commits mailing list
>> vlc-commits at videolan.org
>> https://mailman.videolan.org/listinfo/vlc-commits
> Wouldn't it be better to backport c8f7552339f837cc1f1916179d7380a56726f46e ?
I agree. No need to keep the trees separate when not needed.