(cherry picked from commit a7c0e2a0) Conflicts: include/vlc_vout_display.h
Attach a file by drag & drop or click to upload
