]> git.sesse.net Git - vlc/commitdiff
Revert "Updated sdl to use new VOUT_DISPLAY_CHANGE_DISPLAY_SIZE parameter."
authorLaurent Aimar <fenrir@videolan.org>
Mon, 26 Oct 2009 22:05:27 +0000 (23:05 +0100)
committerLaurent Aimar <fenrir@videolan.org>
Mon, 26 Oct 2009 22:14:32 +0000 (23:14 +0100)
This reverts commit b8dc2568f50ad53a20d555c9d1ce8b0cf0f66eb7.
In the case of SDL, the actual resize is done in VOUT_DISPLAY_CHANGE_DISPLAY_SIZE
without any risk of infinite loop.

modules/video_output/sdl.c

index e769042dc6e0fc3f0acdcb1e900d4de355625ef9..81f47892def4b8753384fb9b9afed89b2c325345 100644 (file)
@@ -477,13 +477,11 @@ static int Control(vout_display_t *vd, int query, va_list args)
 
     case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE: {
         const vout_display_cfg_t *cfg = va_arg(args, const vout_display_cfg_t *);
-        const bool is_forced = (bool)va_arg(args, int);
 
         /* */
-        if (is_forced)
-            sys->display = SDL_SetVideoMode(cfg->display.width,
-                                            cfg->display.height,
-                                            sys->display_bpp, sys->display_flags);
+        sys->display = SDL_SetVideoMode(cfg->display.width,
+                                        cfg->display.height,
+                                        sys->display_bpp, sys->display_flags);
         if (!sys->display) {
             sys->display = SDL_SetVideoMode(vd->cfg->display.width,
                                             vd->cfg->display.height,