summaryrefslogtreecommitdiffstats
path: root/libvo/aspect.c
diff options
context:
space:
mode:
authorattila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-15 15:17:09 +0000
committerattila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-15 15:17:09 +0000
commit092de8005d80e1286a8181bba0d5a52b0f0d1a0f (patch)
treec62bc581e350ad0655349bdbfa4b19542e8916a6 /libvo/aspect.c
parent203de581958a4d22e1a02f9643f2d78d8ac1713b (diff)
downloadmpv-092de8005d80e1286a8181bba0d5a52b0f0d1a0f.tar.bz2
mpv-092de8005d80e1286a8181bba0d5a52b0f0d1a0f.tar.xz
fix aspect hack
now geometry sets geometry_wh_changed when either width or height is changed. aspect is still preserved in fullscreen git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11126 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/aspect.c')
-rw-r--r--libvo/aspect.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libvo/aspect.c b/libvo/aspect.c
index 26b665fb35..c89b92a0ab 100644
--- a/libvo/aspect.c
+++ b/libvo/aspect.c
@@ -1,5 +1,6 @@
/* Stuff for correct aspect scaling. */
#include "aspect.h"
+#include "geometry.h"
#ifndef ASPECT_TEST
#include "../mp_msg.h"
#endif
@@ -60,12 +61,13 @@ void aspect_save_screenres(int scrw, int scrh){
void aspect(int *srcw, int *srch, int zoom){
int tmpw;
- if(!zoom && movie_aspect == 0) {
+ if( !zoom && geometry_wh_changed ) {
#ifdef ASPECT_DEBUG
printf("aspect(0) no aspect forced!\n");
#endif
return; // the user doesn't want to fix aspect
}
+
#ifdef ASPECT_DEBUG
printf("aspect(0) fitin: %dx%d zoom: %d screenaspect: %.2f\n",aspdat.scrw,aspdat.scrh,
zoom,monitor_aspect);