[FFmpeg-cvslog] ffplay: factor out function setting default window size

Marton Balint git at videolan.org
Sat Dec 7 18:54:26 CET 2013


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sun Dec  1 13:25:05 2013 +0100| [2b377fb4c0539dc50b417be98e9ca78c85697520] | committer: Marton Balint

ffplay: factor out function setting default window size

Signed-off-by: Marton Balint <cus at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2b377fb4c0539dc50b417be98e9ca78c85697520
---

 ffplay.c |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index 2eba224..30ee5fd 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1066,20 +1066,24 @@ static void sigterm_handler(int sig)
     exit(123);
 }
 
+static void set_default_window_size(VideoPicture *vp)
+{
+    SDL_Rect rect;
+    calculate_display_rect(&rect, 0, 0, INT_MAX, vp->height, vp);
+    default_width  = rect.w;
+    default_height = rect.h;
+}
+
 static int video_open(VideoState *is, int force_set_video_mode, VideoPicture *vp)
 {
     int flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL;
     int w,h;
-    SDL_Rect rect;
 
     if (is_full_screen) flags |= SDL_FULLSCREEN;
     else                flags |= SDL_RESIZABLE;
 
-    if (vp && vp->width) {
-        calculate_display_rect(&rect, 0, 0, INT_MAX, vp->height, vp);
-        default_width  = rect.w;
-        default_height = rect.h;
-    }
+    if (vp && vp->width)
+        set_default_window_size(vp);
 
     if (is_full_screen && fs_screen_width) {
         w = fs_screen_width;



More information about the ffmpeg-cvslog mailing list