On Fri, Nov 28, 2008 at 08:32:24AM +0000, Jim Hauxwell wrote:
Diego Biurrun wrote:
On Wed, Nov 26, 2008 at 07:26:10PM +0000, Jim Hauxwell wrote:
Diego Biurrun wrote:
On Wed, Nov 26, 2008 at 07:56:18AM +0000, Jim Hauxwell wrote:
This patch is broken and does not apply. I suspect Windows linebreaks. Sorry, my mistake. Visual Studio had decided to add CR/LF to all the lines and svn diff doesn't take this into account.
New, smaller patch file
@@ -264,6 +308,50 @@
+ /* create OSD */ + if (FAILED (IDirect3DDevice9_CreateTexture( + priv->d3d_device, OSD_TEXTURE_SIZE, OSD_TEXTURE_SIZE, 1, D3DUSAGE_DYNAMIC, + D3DFMT_A8L8, D3DPOOL_SYSTEMMEM, &priv->d3d_texture_system, NULL))) { + mp_msg(MSGT_VO,MSGL_ERR, + "<vo_direct3d><INFO>IDirect3DDevice9_CreateTexture Failed (d3d_texture_system).\n");
random indentation, same below
I've altered it, but I just copied mine from the
if (FAILED(IDirect3DDevice9_CreateOffscreenPlainSurface( priv->d3d_device, priv->src_width, priv->src_height, priv->movie_src_fmt, D3DPOOL_DEFAULT, &priv->d3d_surface, NULL))) { mp_msg(MSGT_VO,MSGL_ERR, "<vo_direct3d><INFO>IDirect3D9_CreateOffscreenPlainSurface Failed.\n"); return 0; }
which is already in svn. To your case this has broken indentation.
Fixed.
+ if (FAILED(IDirect3DDevice9_EndScene(priv->d3d_device))) { + mp_msg(MSGT_VO,MSGL_ERR,"<vo_direct3d>EndScene failed\n"); + return;
3 space indentation
A cut and paste from the other place lock is used. That has also got a 3 space indentation and made it into svn by mistake.
Fixed. Diego