summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-11-23 18:50:39 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-11-23 18:50:39 +0000
commit97eeb07265bb41e639e8037e7d06ba1738d15441 (patch)
tree3cb71b83213c2142bf2b47e671bc5db702bff7bf /libvo
parentd86a77d8bab8665df180f789a0c16b5607d97dbb (diff)
downloadmpv-97eeb07265bb41e639e8037e7d06ba1738d15441.tar.bz2
mpv-97eeb07265bb41e639e8037e7d06ba1738d15441.tar.xz
Patch to improve/consistify coding style.
Patch by Georgi Petrov [gogothebee gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28005 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_direct3d.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/libvo/vo_direct3d.c b/libvo/vo_direct3d.c
index 47b2e44fca..cffb964788 100644
--- a/libvo/vo_direct3d.c
+++ b/libvo/vo_direct3d.c
@@ -601,9 +601,9 @@ static void check_events(void)
*/
static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y )
{
- 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 */
/* Lock the offscreen surface if it's not already locked. */
if (!priv->locked_rect.pBits) {
@@ -614,37 +614,37 @@ static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y )
}
}
- UVstride = priv->locked_rect.Pitch / 2;
+ uv_stride = priv->locked_rect.Pitch / 2;
/* Copy Y */
- Dst = priv->locked_rect.pBits;
- Dst = Dst + priv->locked_rect.Pitch * y + x;
- Src=src[0];
- memcpy_pic(Dst, Src, w, h, priv->locked_rect.Pitch, stride[0]);
+ dst = priv->locked_rect.pBits;
+ dst = dst + priv->locked_rect.Pitch * y + x;
+ my_src=src[0];
+ memcpy_pic(dst, my_src, w, h, priv->locked_rect.Pitch, stride[0]);
w/=2;h/=2;x/=2;y/=2;
/* Copy U */
- Dst = priv->locked_rect.pBits;
- Dst = Dst + priv->locked_rect.Pitch * priv->src_height
- + UVstride * y + x;
+ dst = priv->locked_rect.pBits;
+ dst = dst + priv->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 = priv->locked_rect.pBits;
- Dst = Dst + priv->locked_rect.Pitch * priv->src_height
- + UVstride * (priv->src_height / 2) + UVstride * y + x;
+ dst = priv->locked_rect.pBits;
+ dst = dst + priv->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]);
return 0; /* Success */
}