Mercurial > mplayer.hg

comparison 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
comparison
equal deleted inserted replaced
3239:ef38487113b1 3240:fbdb14138675
377 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_VOincompCodec); 377 mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_VOincompCodec);
378 exit(1); // exit_player(MSGTR_Exit_error); 378 exit(1); // exit_player(MSGTR_Exit_error);
379 } 379 }
380 sh_video->outfmtidx=i; 380 sh_video->outfmtidx=i;
381 381
382 if(out_fmt==IMGFMT_YV12 && vo_w!=0 && vo_h!=0) 382 if(out_fmt==IMGFMT_YV12 && (vo_w!=0 || vo_h!=0))
383 { 383 {
384 scale_srcW= sh_video->disp_w; 384 scale_srcW= sh_video->disp_w;
385 scale_srcH= sh_video->disp_h; 385 scale_srcH= sh_video->disp_h;
386 if(!vo_w) vo_w=sh_video->disp_w;
387 if(!vo_h) vo_h=sh_video->disp_h;
386 } 388 }
387 else 389 else
388 { 390 {
389 vo_w=sh_video->disp_w; 391 vo_w=sh_video->disp_w;
390 vo_h=sh_video->disp_h; 392 vo_h=sh_video->disp_h;