# HG changeset patch
# User reimar
# Date 1348850808 0
# Node ID 1278ec134f6b3e8311305d472a52579c2d3970f3
# Parent  556d87f557ed63c99bc494ae9bc6732daeaec687
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.

diff -r 556d87f557ed -r 1278ec134f6b libvo/video_out.h
--- a/libvo/video_out.h	Thu Sep 27 20:59:24 2012 +0000
+++ b/libvo/video_out.h	Fri Sep 28 16:46:48 2012 +0000
@@ -291,7 +291,7 @@
 
 static inline int aspect_scaling(void)
 {
-  return vo_fs;
+  return vo_fs || vo_keepaspect;
 }
 
 #endif /* MPLAYER_VIDEO_OUT_H */