comparison libvo/video_out.h @ 35126:1278ec134f6b

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.
author reimar
date Fri, 28 Sep 2012 16:46:48 +0000
parents dda2444f4825
children 29fb09ef97b9
comparison
equal deleted inserted replaced
35125:556d87f557ed 35126:1278ec134f6b
289 return IMGFMT_IS_YUVP16(fmt) ? 2 : 1; 289 return IMGFMT_IS_YUVP16(fmt) ? 2 : 1;
290 } 290 }
291 291
292 static inline int aspect_scaling(void) 292 static inline int aspect_scaling(void)
293 { 293 {
294 return vo_fs; 294 return vo_fs || vo_keepaspect;
295 } 295 }
296 296
297 #endif /* MPLAYER_VIDEO_OUT_H */ 297 #endif /* MPLAYER_VIDEO_OUT_H */