diff options
| author | zuxy <zuxy@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-10-27 12:37:26 +0000 |
|---|---|---|
| committer | zuxy <zuxy@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-10-27 12:37:26 +0000 |
| commit | a916b0cf0ee025f8cc0d551c708a4f2b7ca9e90a (patch) | |
| tree | 67a8428c751818920782c6fdcc1d67b86375bf59 /libvo | |
| parent | 8ff6e8a567174932f8593c69ac46ebda4720cba4 (diff) | |
| download | mpv-a916b0cf0ee025f8cc0d551c708a4f2b7ca9e90a.tar.bz2 mpv-a916b0cf0ee025f8cc0d551c708a4f2b7ca9e90a.tar.xz | |
Cosmetic fix for r24861
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24863 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_directx.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c index 953fee86e5..f381bcf240 100644 --- a/libvo/vo_directx.c +++ b/libvo/vo_directx.c @@ -1176,15 +1176,15 @@ static void flip_page(void) 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 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin 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; |