summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-07-28 22:42:20 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-07-28 22:42:20 +0000
commite94b93b2c4fdd370b4f34654d05cb94db38579a3 (patch)
tree39e3cb17527867db3ea4fa0f136e088b91de65f0 /libvo
parent10f6c95996ada092895163b1ffe2ee0df64e8a21 (diff)
downloadmpv-e94b93b2c4fdd370b4f34654d05cb94db38579a3.tar.bz2
mpv-e94b93b2c4fdd370b4f34654d05cb94db38579a3.tar.xz
Use a new variable for user-supplied monitor-aspect so we can overwrite
a value generated from pixel-aspect if resolution changes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23896 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/aspect.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libvo/aspect.c b/libvo/aspect.c
index c5fd8ec819..b7f9b4bc84 100644
--- a/libvo/aspect.c
+++ b/libvo/aspect.c
@@ -19,6 +19,7 @@ float vo_panscanrange = 1.0;
#include "video_out.h"
+float force_monitor_aspect=0;
float monitor_aspect=0;
float monitor_pixel_aspect=1;
extern float movie_aspect;
@@ -55,7 +56,9 @@ void aspect_save_screenres(int scrw, int scrh){
#endif
aspdat.scrw = scrw;
aspdat.scrh = scrh;
- if (!monitor_aspect)
+ if (force_monitor_aspect)
+ monitor_aspect = force_monitor_aspect;
+ else
monitor_aspect = monitor_pixel_aspect * scrw / scrh;
}