[vlc-commits] vout: win32: direct3d11: fixup of d1e7dc1

Filip Roséen git at videolan.org
Wed Aug 1 15:16:41 CEST 2018


vlc | branch: master | Filip Roséen <filip at atch.se> | Tue Jul 31 11:58:29 2018 +0200| [df51fffb3bda34c22a3c74f3c17f740a552a33ed] | committer: Steve Lhomme

vout: win32: direct3d11: fixup of d1e7dc1

As d1e7dc1 explicitly adds copying of the relevant fmt after the
function is called, the function itself should not be part of such
copying (to make matters worse, shallow copy is unsafe as the struct
may contain pointers to dynamically allocated resources).

fixes: #20487

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=df51fffb3bda34c22a3c74f3c17f740a552a33ed
---

 modules/video_output/win32/direct3d11.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index 980585d229..009281c4be 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -1326,7 +1326,6 @@ static int SetupOutputFormat(vout_display_t *vd, video_format_t *fmt)
         Direct3D11DestroyResources(vd);
         return VLC_EGENERIC;
     }
-    vd->fmt = *fmt;
 
     return VLC_SUCCESS;
 }



More information about the vlc-commits mailing list