Merge remote-tracking branch 'notaz/master'

diff --cc plat_sdl.c
index 5e3eb7c,530a9d7..2d537f0
--- 1/plat_sdl.c
--- 2/plat_sdl.c
+++ b/plat_sdl.c
@@@ -104,10 -99,9 +104,9 @@@ int plat_sdl_change_video_mode(int w, i
  
    if (plat_target.vout_method == vout_mode_overlay
        || plat_target.vout_method == vout_mode_overlay2x) {
 -    int W = plat_target.vout_method == vout_mode_overlay2x && w == 320 ? 2*w : w;
 +    int W = plat_target.vout_method == vout_mode_overlay2x && w < 640 ? 2*w : w;
      plat_sdl_overlay = SDL_CreateYUVOverlay(W, h, SDL_UYVY_OVERLAY, plat_sdl_screen);
-     if (plat_sdl_overlay != NULL) {
-       SDL_LockYUVOverlay(plat_sdl_overlay);
+     if (plat_sdl_overlay != NULL && SDL_LockYUVOverlay(plat_sdl_overlay) == 0) {
        if ((long)plat_sdl_overlay->pixels[0] & 3)
          fprintf(stderr, "warning: overlay pointer is unaligned\n");