(cherry picked from commit 696e5db02b5d7355a4576e2dd9176f9bf5961faa)

Conflicts:
	modules/video_output/macosx.m