[Mplayer-cvslog] CVS: main mencoder.c,1.28,1.29

[Michael Niedermayer]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv8804

Modified Files:
	mencoder.c 
Log Message:
bugfix if only -x or only -y is used


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mencoder.c	1 Dec 2001 01:29:25 -0000	1.28
+++ mencoder.c	1 Dec 2001 12:24:46 -0000	1.29
@@ -379,10 +379,12 @@
 }
 sh_video->outfmtidx=i;
 
-if(out_fmt==IMGFMT_YV12 && vo_w!=0 && vo_h!=0)
+if(out_fmt==IMGFMT_YV12 && (vo_w!=0 || vo_h!=0))
 {
 	scale_srcW= sh_video->disp_w;
 	scale_srcH= sh_video->disp_h;
+	if(!vo_w) vo_w=sh_video->disp_w;
+	if(!vo_h) vo_h=sh_video->disp_h;
 }
 else
 {