[FFmpeg-cvslog] ffplay: make initial window size calculation based on aspect ratio

[Marton Balint]

ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sat Sep  1 15:01:29 2012 +0200| [255c7bb1837cd0cdc454108df9d3fc79cf363bb5] | committer: Marton Balint

ffplay: make initial window size calculation based on aspect ratio

Fixes ticket #291.

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

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

 ffplay.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index a493cbc..45e23c4 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -963,6 +963,7 @@ static int video_open(VideoState *is, int force_set_video_mode)
     int flags = SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL;
     int w,h;
     VideoPicture *vp = &is->pictq[is->pictq_rindex];
+    SDL_Rect rect;
 
     if (is_full_screen) flags |= SDL_FULLSCREEN;
     else                flags |= SDL_RESIZABLE;
@@ -974,8 +975,9 @@ static int video_open(VideoState *is, int force_set_video_mode)
         w = screen_width;
         h = screen_height;
     } else if (vp->width) {
-        w = vp->width;
-        h = vp->height;
+        calculate_display_rect(&rect, 0, 0, INT_MAX, vp->height, vp);
+        w = rect.w;
+        h = rect.h;
     } else {
         w = 640;
         h = 480;