Merge pull request #2703 from ace20022/cores_revised

[vuplus_xbmc] / xbmc / cores / dvdplayer / DVDCodecs / DVDCodecUtils.cpp

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
index 8e28854..5443cb3 100644 (file)
--- a/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
@@ -195,11 +195,10 @@ DVDVideoPicture* CDVDCodecUtils::ConvertToNV12Picture(DVDVideoPicture *pSrc)
       }
 
       //copy chroma
-      uint8_t *s_u, *s_v, *d_uv;
       for (int y = 0; y < (int)pSrc->iHeight/2; y++) {
-        s_u = pSrc->data[1] + (y * pSrc->iLineSize[1]);
-        s_v = pSrc->data[2] + (y * pSrc->iLineSize[2]);
-        d_uv = pPicture->data[1] + (y * pPicture->iLineSize[1]);
+        uint8_t *s_u = pSrc->data[1] + (y * pSrc->iLineSize[1]);
+        uint8_t *s_v = pSrc->data[2] + (y * pSrc->iLineSize[2]);
+        uint8_t *d_uv = pPicture->data[1] + (y * pPicture->iLineSize[1]);
         for (int x = 0; x < (int)pSrc->iWidth/2; x++) {
           *d_uv++ = *s_u++;
           *d_uv++ = *s_v++;