The XVideo and X11 outputs can cope with this properly now
(cherry picked from commit 9e47aa722c12324cb5915750d717d9dc281ca7f9)