Mercurial > mplayer.hg
changeset 24835:b6d6af21c2ee
Cosmetic fix for r24861
| author | zuxy |
|---|---|
| date | Sat, 27 Oct 2007 12:37:26 +0000 |
| parents | a8ef08f502c0 |
| children | 4e90fdb819b0 |
| files | libvo/vo_directx.c |
| diffstat | 1 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_directx.c Sat Oct 27 12:33:56 2007 +0000 +++ b/libvo/vo_directx.c Sat Oct 27 12:37:26 2007 +0000 @@ -1176,15 +1176,15 @@ g_lpddsPrimary->lpVtbl->Blt(g_lpddsPrimary, &rd, g_lpddsBack, NULL, DDBLT_WAIT, &ddbltfx); } if (g_lpddsBack->lpVtbl->Lock(g_lpddsBack,NULL,&ddsdsf, DDLOCK_NOSYSLOCK | DDLOCK_WAIT , NULL) == DD_OK) { - if(vo_directrendering && (dstride != ddsdsf.lPitch)){ - mp_msg(MSGT_VO,MSGL_WARN,"<vo_directx><WARN>stride changed !!!! disabling direct rendering\n"); - vo_directrendering=0; - } - if (tmp_image) - free(tmp_image); - tmp_image = NULL; - dstride = ddsdsf.lPitch; - image = ddsdsf.lpSurface; + if(vo_directrendering && (dstride != ddsdsf.lPitch)){ + mp_msg(MSGT_VO,MSGL_WARN,"<vo_directx><WARN>stride changed !!!! disabling direct rendering\n"); + vo_directrendering=0; + } + if (tmp_image) + free(tmp_image); + tmp_image = NULL; + dstride = ddsdsf.lPitch; + image = ddsdsf.lpSurface; } else if (!tmp_image) { mp_msg(MSGT_VO, MSGL_WARN, "<vo_directx><WARN>Locking the surface failed, rendering to a hidden surface!\n"); tmp_image = image = calloc(1, image_height * dstride * 2); @@ -1391,9 +1391,9 @@ memset(&ddsdsf, 0,sizeof(DDSURFACEDESC2)); ddsdsf.dwSize = sizeof (DDSURFACEDESC2); if (g_lpddsBack->lpVtbl->Lock(g_lpddsBack,NULL,&ddsdsf, DDLOCK_NOSYSLOCK | DDLOCK_WAIT, NULL) == DD_OK) { - dstride = ddsdsf.lPitch; - image = ddsdsf.lpSurface; - return 0; + dstride = ddsdsf.lPitch; + image = ddsdsf.lpSurface; + return 0; } mp_msg(MSGT_VO, MSGL_V, "<vo_directx><ERROR>Initial Lock on the Surface failed.\n"); return 1;