(cherry picked from commit a7c0e2a065b845e9bdd7f00bb7bd8e86a93b5dbe)

Conflicts:

	include/vlc_vout_display.h