fix regressions on x11 video integration after !1755 (merged)
Somehow the second patch doesn't seems necessary with xcb, but maybe that's just my configuration.
ping @jeffk as you may have some insights on the matter.
