dont use SDL_WM_ToggleFullScreen() as that doesnt seem to work reliably if a...

dont use SDL_WM_ToggleFullScreen() as that doesnt seem to work reliably if a SDL_SetVideoMode() is called quickly afterwards


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@7390 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

ffplay.c

@@ -833,12 +833,13 @@ static int video_open(VideoState *is){
     int flags = SDL_HWSURFACE|SDL_ASYNCBLIT|SDL_HWACCEL;
     int w,h;
 
+    if(is_full_screen) flags |= SDL_FULLSCREEN;
+    else               flags |= SDL_RESIZABLE;
+
     if (is_full_screen && fs_screen_width) {
         w = fs_screen_width;
         h = fs_screen_height;
-        flags |= SDL_FULLSCREEN;
-    } else {
-        if(screen_width){
+    } else if(!is_full_screen && screen_width){
         w = screen_width;
         h = screen_height;
     }else if (is->video_st && is->video_st->codec->width){
@@ -848,8 +849,6 @@ static int video_open(VideoState *is){
         w = 640;
         h = 480;
     }
-        flags |= SDL_RESIZABLE;
-    }
 #ifndef CONFIG_DARWIN
     screen = SDL_SetVideoMode(w, h, 0, flags);
 #else
@@ -2147,11 +2146,9 @@ static void toggle_full_screen(void)
     is_full_screen = !is_full_screen;
     if (!fs_screen_width) {
         /* use default SDL method */
-        SDL_WM_ToggleFullScreen(screen);
-    } else {
-        /* use the recorded resolution */
-        video_open(cur_stream);
+//        SDL_WM_ToggleFullScreen(screen);
     }
+    video_open(cur_stream);
 }
 
 static void toggle_pause(void)