[vlc-devel] commit: Revert " Updated sdl to use new VOUT_DISPLAY_CHANGE_DISPLAY_SIZE parameter." ( Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Mon Oct 26 23:05:27 2009 +0100| [e31d300762fac5baf33017eeba272c4e50659dea] | committer: Laurent Aimar 

Revert "Updated sdl to use new VOUT_DISPLAY_CHANGE_DISPLAY_SIZE parameter."

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.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e31d300762fac5baf33017eeba272c4e50659dea
---

 modules/video_output/sdl.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index e769042..81f4789 100644
--- a/modules/video_output/sdl.c
+++ b/modules/video_output/sdl.c
@@ -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,