(cherry picked from commit bec9b75ce8156585bf57642798f3f09d83d189d9)

Conflicts:
	modules/gui/macosx/VideoEffects.m