summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorattila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-15 16:50:27 +0000
committerattila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-15 16:50:27 +0000
commit73df49ec95e3147c7bacfacab0aac90c5eb0dcf2 (patch)
treed91def63af9f5a94f5f2ba54b810fd3a29f8c804 /libvo
parent0c2f4a3989efa56e846778bb0c5b5359dd17752c (diff)
downloadmpv-73df49ec95e3147c7bacfacab0aac90c5eb0dcf2.tar.bz2
mpv-73df49ec95e3147c7bacfacab0aac90c5eb0dcf2.tar.xz
I found that the tdfxfb video output driver doesn't work when compiled with
gcc 3.x. The OSD works fine, but the video size is not adjusted properly (it is always the same size as a console character). This patch corrects it (at least it works on my system). Tested with gcc 3.3.1 and gcc 2.95.4. patch by Jesús Sánchez <gusanje@yahoo.es> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11130 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_tdfxfb.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/libvo/vo_tdfxfb.c b/libvo/vo_tdfxfb.c
index 554ea6c7eb..cb7fa663f0 100644
--- a/libvo/vo_tdfxfb.c
+++ b/libvo/vo_tdfxfb.c
@@ -76,7 +76,7 @@ static uint32_t in_width, in_height, in_format, in_depth, in_voodoo_format,
vid_voodoo_format, *vidpage, *hidpage, *inpage, vidpageoffset,
hidpageoffset, inpageoffset, *memBase0 = NULL, *memBase1 = NULL, r_width, r_height;
static volatile voodoo_io_reg *reg_IO;
-static voodoo_2d_reg *reg_2d;
+static volatile voodoo_2d_reg *reg_2d;
static voodoo_yuv_reg *reg_YUV;
static struct YUV_plane *YUV;
static void (*alpha_func)(), (*alpha_func_double)();
@@ -349,10 +349,6 @@ static void flip_page(void)
{
voodoo_2d_reg regs = *reg_2d; /* Copy the regs */
int i = 0;
- /* This has to be done of else setting dstSize doesn't work */
- /* Must be a gcc 3.0+ bug */
- int tempvidheight = vidheight;
- int tempvidwidth = vidwidth;
if(vo_doublebuffering) {
/* Flip to an offscreen buffer for rendering */
@@ -377,7 +373,6 @@ static void flip_page(void)
reg_2d->dstBaseAddr = vidpageoffset;
reg_2d->dstXY = XYREG(vidx, vidy);
reg_2d->dstFormat = vid_voodoo_format;
- /* The XYREG macro doesn't seem to work for this line so build the register contents very explicitly */
reg_2d->dstSize = XYREG(vidwidth, vidheight);
reg_2d->command = S2S_STRECH_BLT | S2S_IMMED | S2S_ROP;