-
Felix Paul Kühne authored
(cherry picked from commit 0a86a76fec01fe495ace7894c4ecb6be32b4fef7) Conflicts: modules/video_output/macosx.m
7ce065dd
(cherry picked from commit 0a86a76fec01fe495ace7894c4ecb6be32b4fef7) Conflicts: modules/video_output/macosx.m