From 2b377fb4c0539dc50b417be98e9ca78c85697520 Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Sun, 1 Dec 2013 13:25:05 +0100 Subject: ffplay: factor out function setting default window size Signed-off-by: Marton Balint --- ffplay.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'ffplay.c') diff --git a/ffplay.c b/ffplay.c index 2eba224f8f..30ee5fdf43 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; -- cgit v1.2.3