[MPlayer-cvslog] r35220 - trunk/libvo/video_out.h

[reimar]

Author: reimar
Date: Fri Sep 28 18:46:48 2012
New Revision: 35220

Log:
Enable aspect scaling even in windowed mode when
-keepaspect is enabled.

This is probably not the best and final solution, but
it makes at least -vo gl work nicer on OSX and with
Linux window managers that do not support enforcing
aspect.

Modified:
   trunk/libvo/video_out.h

Modified: trunk/libvo/video_out.h
==============================================================================
--- trunk/libvo/video_out.h	Thu Sep 27 22:59:24 2012	(r35219)
+++ trunk/libvo/video_out.h	Fri Sep 28 18:46:48 2012	(r35220)
@@ -291,7 +291,7 @@ static inline int pixel_stride(unsigned 
 
 static inline int aspect_scaling(void)
 {
-  return vo_fs;
+  return vo_fs || vo_keepaspect;
 }
 
 #endif /* MPLAYER_VIDEO_OUT_H */