RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Cosmetic fix for r24861 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24863 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
zuxy 2007-10-27 12:37:26 +00:00
parent 8ff6e8a567
commit a916b0cf0e
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libvo/vo_directx.c
View File

@ -1176,15 +1176,15 @@ static void flip_page(void)
g_lpddsPrimary->lpVtbl->Blt(g_lpddsPrimary, &rd, g_lpddsBack, NULL, DDBLT_WAIT, &ddbltfx); 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 (g_lpddsBack->lpVtbl->Lock(g_lpddsBack,NULL,&ddsdsf, DDLOCK_NOSYSLOCK | DDLOCK_WAIT , NULL) == DD_OK) {
if(vo_directrendering && (dstride != ddsdsf.lPitch)){ if(vo_directrendering && (dstride != ddsdsf.lPitch)){
mp_msg(MSGT_VO,MSGL_WARN,"<vo_directx><WARN>stride changed !!!! disabling direct rendering\n"); mp_msg(MSGT_VO,MSGL_WARN,"<vo_directx><WARN>stride changed !!!! disabling direct rendering\n");
vo_directrendering=0; vo_directrendering=0;
} }
if (tmp_image) if (tmp_image)
free(tmp_image); free(tmp_image);
tmp_image = NULL; tmp_image = NULL;
dstride = ddsdsf.lPitch; dstride = ddsdsf.lPitch;
image = ddsdsf.lpSurface; image = ddsdsf.lpSurface;
} else if (!tmp_image) { } else if (!tmp_image) {
mp_msg(MSGT_VO, MSGL_WARN, "<vo_directx><WARN>Locking the surface failed, rendering to a hidden surface!\n"); 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); tmp_image = image = calloc(1, image_height * dstride * 2);
@ -1391,9 +1391,9 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
memset(&ddsdsf, 0,sizeof(DDSURFACEDESC2)); memset(&ddsdsf, 0,sizeof(DDSURFACEDESC2));
ddsdsf.dwSize = sizeof (DDSURFACEDESC2); ddsdsf.dwSize = sizeof (DDSURFACEDESC2);
if (g_lpddsBack->lpVtbl->Lock(g_lpddsBack,NULL,&ddsdsf, DDLOCK_NOSYSLOCK | DDLOCK_WAIT, NULL) == DD_OK) { if (g_lpddsBack->lpVtbl->Lock(g_lpddsBack,NULL,&ddsdsf, DDLOCK_NOSYSLOCK | DDLOCK_WAIT, NULL) == DD_OK) {
dstride = ddsdsf.lPitch; dstride = ddsdsf.lPitch;
image = ddsdsf.lpSurface; image = ddsdsf.lpSurface;
return 0; return 0;
} }
mp_msg(MSGT_VO, MSGL_V, "<vo_directx><ERROR>Initial Lock on the Surface failed.\n"); mp_msg(MSGT_VO, MSGL_V, "<vo_directx><ERROR>Initial Lock on the Surface failed.\n");
return 1; return 1;