[FFmpeg-cvslog] r27731 - in trunk/libswscale: swscale.c swscale_template.c

[vitor]

Author: vitor
Date: Wed Oct  8 19:48:23 2008
New Revision: 27731

Log:
Do not set src[1] to the palette, it is now in the context


Modified:
   trunk/libswscale/swscale.c
   trunk/libswscale/swscale_template.c

Modified: trunk/libswscale/swscale.c
==============================================================================
--- trunk/libswscale/swscale.c	(original)
+++ trunk/libswscale/swscale.c	Wed Oct  8 19:48:23 2008
@@ -2741,7 +2741,6 @@ int sws_scale(SwsContext *c, uint8_t* sr
             c->pal_yuv[i]= y + (u<<8) + (v<<16);
             c->pal_rgb[i]= b + (g<<8) + (r<<16);
         }
-        src2[1]= (uint8_t*)c->pal_yuv;
     }
 
     // copy strides, so they can safely be modified

Modified: trunk/libswscale/swscale_template.c
==============================================================================
--- trunk/libswscale/swscale_template.c	(original)
+++ trunk/libswscale/swscale_template.c	Wed Oct  8 19:48:23 2008
@@ -2926,7 +2926,7 @@ static int RENAME(swScale)(SwsContext *c
     const int chrSrcSliceY= srcSliceY >> c->chrSrcVSubSample;
     const int chrSrcSliceH= -((-srcSliceH) >> c->chrSrcVSubSample);
     int lastDstY;
-    uint32_t *pal=NULL;
+    uint32_t *pal=c->pal_yuv;
 
     /* vars which will change and which we need to store back in the context */
     int dstY= c->dstY;
@@ -2936,7 +2936,6 @@ static int RENAME(swScale)(SwsContext *c
     int lastInChrBuf= c->lastInChrBuf;
 
     if (isPacked(c->srcFormat)){
-        pal= (uint32_t *)src[1];
         src[0]=
         src[1]=
         src[2]= src[0];