Index: libvo/vo_direct3d.c
===================================================================
--- libvo/vo_direct3d.c	(revision 27999)
+++ libvo/vo_direct3d.c	(working copy)
@@ -609,9 +609,9 @@
 {
     D3DLOCKED_RECT  locked_rect;   /**< Offscreen surface we lock in order
                                          to copy MPlayer's frame inside it.*/
-    char *Src;      /**< Pointer to the source image */
-    char *Dst;      /**< Pointer to the destination image */
-    int  UVstride;  /**< Stride of the U/V planes */
+    char *my_src;    /**< Pointer to the source image */
+    char *dst;       /**< Pointer to the destination image */
+    int  uv_stride;  /**< Stride of the U/V planes */
 
     if (FAILED(IDirect3DDevice9_BeginScene(priv->d3d_device))) {
        mp_msg(MSGT_VO,MSGL_ERR,"<vo_direct3d>BeginScene failed\n");
@@ -624,37 +624,37 @@
         return VO_FALSE;
     }
 
-    UVstride = locked_rect.Pitch / 2;
+    uv_stride = locked_rect.Pitch / 2;
 
     /* Copy Y */
-    Dst = locked_rect.pBits;
-    Dst = Dst + locked_rect.Pitch * y + x;
-    Src=src[0];
-    memcpy_pic(Dst, Src, w, h, locked_rect.Pitch, stride[0]);
+    dst = locked_rect.pBits;
+    dst = dst + locked_rect.Pitch * y + x;
+    my_src=src[0];
+    memcpy_pic(dst, my_src, w, h, locked_rect.Pitch, stride[0]);
 
     w/=2;h/=2;x/=2;y/=2;
 
     /* Copy U */
-    Dst = locked_rect.pBits;
-    Dst = Dst + locked_rect.Pitch * priv->src_height
-          + UVstride * y + x;
+    dst = locked_rect.pBits;
+    dst = dst + locked_rect.Pitch * priv->src_height
+          + uv_stride * y + x;
     if (priv->movie_src_fmt == MAKEFOURCC('Y','V','1','2'))
-        Src=src[2];
+        my_src=src[2];
     else
-        Src=src[1];
+        my_src=src[1];
 
-    memcpy_pic(Dst, Src, w, h, UVstride, stride[1]);
+    memcpy_pic(dst, my_src, w, h, uv_stride, stride[1]);
 
     /* Copy V */
-    Dst = locked_rect.pBits;
-    Dst = Dst + locked_rect.Pitch * priv->src_height
-          + UVstride * (priv->src_height / 2) + UVstride * y + x;
+    dst = locked_rect.pBits;
+    dst = dst + locked_rect.Pitch * priv->src_height
+          + uv_stride * (priv->src_height / 2) + uv_stride * y + x;
     if (priv->movie_src_fmt == MAKEFOURCC('Y','V','1','2'))
-        Src=src[1];
+        my_src=src[1];
     else
-        Src=src[2];
+        my_src=src[2];
 
-    memcpy_pic(Dst, Src, w, h, UVstride, stride[2]);
+    memcpy_pic(dst, my_src, w, h, uv_stride, stride[2]);
 
     if (FAILED(IDirect3DSurface9_UnlockRect(priv->d3d_surface))) {
         mp_msg(MSGT_VO,MSGL_V,"<vo_direct3d>Surface unlock failure\n");