diff options
| author | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-04-26 16:56:21 +0000 |
|---|---|---|
| committer | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-04-26 16:56:21 +0000 |
| commit | 748e2bcb488f4c4589b03074a869825530c56cb1 (patch) | |
| tree | 067f748ec7b0c0717665d24c9f6bec83563025e9 /libvo | |
| parent | 3be27c141a8be7c4f50de5dbdd36ab6cd3e78fa6 (diff) | |
| download | mpv-748e2bcb488f4c4589b03074a869825530c56cb1.tar.bz2 mpv-748e2bcb488f4c4589b03074a869825530c56cb1.tar.xz | |
fix panscan font resizing with vo_mga
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9995 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/mga_common.c | 6 | ||||
| -rw-r--r-- | libvo/vo_mga.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libvo/mga_common.c b/libvo/mga_common.c index 558818ded6..8a2d81be75 100644 --- a/libvo/mga_common.c +++ b/libvo/mga_common.c @@ -27,7 +27,7 @@ static uint32_t drwcX,drwcY,dwidth,dheight; static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ uint32_t bespitch = (mga_vid_config.src_width + 31) & ~31; -// x0+=mga_vid_config.src_width*(vo_panscan_x>>1)/(vo_dwidth+vo_panscan_x); + x0+=mga_vid_config.src_width*(vo_panscan_x>>1)/(vo_dwidth+vo_panscan_x); switch(mga_vid_config.format){ case MGA_VID_FORMAT_YV12: case MGA_VID_FORMAT_IYUV: @@ -45,8 +45,8 @@ static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned static void draw_osd(void) { - vo_draw_text(mga_vid_config.src_width,mga_vid_config.src_height,draw_alpha); -// vo_draw_text(mga_vid_config.src_width-mga_vid_config.src_width*vo_panscan_x/(vo_dwidth+vo_panscan_x),mga_vid_config.src_height,draw_alpha); +// vo_draw_text(mga_vid_config.src_width,mga_vid_config.src_height,draw_alpha); + vo_draw_text(mga_vid_config.src_width-mga_vid_config.src_width*vo_panscan_x/(vo_dwidth+vo_panscan_x),mga_vid_config.src_height,draw_alpha); } diff --git a/libvo/vo_mga.c b/libvo/vo_mga.c index c8397e8cab..9861c95ed2 100644 --- a/libvo/vo_mga.c +++ b/libvo/vo_mga.c @@ -70,6 +70,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32 printf("vo_mga aspect(): resized to %dx%d\n",d_width,d_height); } + vo_dwidth=d_width; vo_dheight=d_height; mga_vid_config.dest_width = d_width; mga_vid_config.dest_height= d_height; mga_vid_config.x_org= 0; // (720-mga_vid_config.dest_width)/2; |