comparison libvo/vo_directx.c @ 34752:ad2b851c3f19

vo_directx: do not do aspect scaling in windowed mode. This matches behaviour of other vos.
author reimar
date Wed, 04 Apr 2012 19:12:16 +0000
parents 3f409c370881
children 568f0925d9a9
comparison
equal deleted inserted replaced
34751:97b5fb86090e 34752:ad2b851c3f19
462 rd.left = vo_dx - xinerama_x; 462 rd.left = vo_dx - xinerama_x;
463 rd.top = vo_dy - xinerama_y; 463 rd.top = vo_dy - xinerama_y;
464 width = vo_dwidth; 464 width = vo_dwidth;
465 height = vo_dheight; 465 height = vo_dheight;
466 466
467 aspect(&width, &height, A_WINZOOM); 467 if (aspect_scaling()) {
468 panscan_calc_windowed(); 468 aspect(&width, &height, A_WINZOOM);
469 width += vo_panscan_x; 469 panscan_calc_windowed();
470 height += vo_panscan_y; 470 width += vo_panscan_x;
471 height += vo_panscan_y;
472 }
471 width = FFMIN(width, vo_screenwidth); 473 width = FFMIN(width, vo_screenwidth);
472 height = FFMIN(height, vo_screenheight); 474 height = FFMIN(height, vo_screenheight);
473 rd.left += (vo_dwidth - width) / 2; 475 rd.left += (vo_dwidth - width) / 2;
474 rd.top += (vo_dheight - height) / 2; 476 rd.top += (vo_dheight - height) / 2;
475 477