summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorattila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-09-21 11:56:09 +0000
committerattila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-09-21 11:56:09 +0000
commit386e88d91824452d256ee37cf01026647dd6b6f8 (patch)
treeca1cb1ff069b80a341f869d2f21e658eb3f2c0a5 /libvo
parentdbe00d64257b0ee3ab5c0869e2e2c7846d4b3b25 (diff)
downloadmpv-386e88d91824452d256ee37cf01026647dd6b6f8.tar.bz2
mpv-386e88d91824452d256ee37cf01026647dd6b6f8.tar.xz
make aspect recognize -noaspect
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10908 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/aspect.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libvo/aspect.c b/libvo/aspect.c
index 371dc16f8a..bfba2a1afa 100644
--- a/libvo/aspect.c
+++ b/libvo/aspect.c
@@ -17,6 +17,7 @@ float vo_panscan_amount = 0;
#include "video_out.h"
float monitor_aspect=4.0/3.0;
+extern float movie_aspect;
static struct {
int orgw; // real width
@@ -59,6 +60,7 @@ void aspect_save_screenres(int scrw, int scrh){
void aspect(int *srcw, int *srch, int zoom){
int tmpw;
+ if(movie_aspect == 0) return; // the user doesnt 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);