Mercurial > mplayer.hg

diff mencoder.c @ 3240:fbdb14138675

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bugfix if only -x or only -y is used
author michael
date Sat, 01 Dec 2001 12:24:46 +0000
parents 1774d0530a6d
children ac8b70dd5e45
line wrap: on
line diff
--- a/mencoder.c	Sat Dec 01 11:30:22 2001 +0000
+++ b/mencoder.c	Sat Dec 01 12:24:46 2001 +0000
@@ -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
 {