summaryrefslogtreecommitdiffstats
path: root/mencoder.c
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-01 12:24:46 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-01 12:24:46 +0000
commit6db942a8e6c5af61c333ee55cb862d13eb583264 (patch)
tree59095dd9739493be1f27ebd446b006c86f22ff9a /mencoder.c
parent0a6dd6d81bcea2805fbe6130c295f67c5ce540ea (diff)
downloadmpv-6db942a8e6c5af61c333ee55cb862d13eb583264.tar.bz2
mpv-6db942a8e6c5af61c333ee55cb862d13eb583264.tar.xz
bugfix if only -x or only -y is used
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3241 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r--mencoder.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mencoder.c b/mencoder.c
index 936452f385..8473eb0d71 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -379,10 +379,12 @@ if(i>=CODECS_MAX_OUTFMT){
}
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
{