(cherry picked from commit 39863326) Conflicts: modules/video_output/x11/glx.c
Attach a file by drag & drop or click to upload
