Commit e150ef8d authored by Vitor Sessak's avatar Vitor Sessak
Browse files

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

Originally committed as revision 27731 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
parent 49004617
...@@ -2741,7 +2741,6 @@ int sws_scale(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, ...@@ -2741,7 +2741,6 @@ int sws_scale(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
c->pal_yuv[i]= y + (u<<8) + (v<<16); c->pal_yuv[i]= y + (u<<8) + (v<<16);
c->pal_rgb[i]= b + (g<<8) + (r<<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 // copy strides, so they can safely be modified
......
...@@ -2926,7 +2926,7 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s ...@@ -2926,7 +2926,7 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s
const int chrSrcSliceY= srcSliceY >> c->chrSrcVSubSample; const int chrSrcSliceY= srcSliceY >> c->chrSrcVSubSample;
const int chrSrcSliceH= -((-srcSliceH) >> c->chrSrcVSubSample); const int chrSrcSliceH= -((-srcSliceH) >> c->chrSrcVSubSample);
int lastDstY; 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 */ /* vars which will change and which we need to store back in the context */
int dstY= c->dstY; int dstY= c->dstY;
...@@ -2936,7 +2936,6 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s ...@@ -2936,7 +2936,6 @@ static int RENAME(swScale)(SwsContext *c, uint8_t* src[], int srcStride[], int s
int lastInChrBuf= c->lastInChrBuf; int lastInChrBuf= c->lastInChrBuf;
if (isPacked(c->srcFormat)){ if (isPacked(c->srcFormat)){
pal= (uint32_t *)src[1];
src[0]= src[0]=
src[1]= src[1]=
src[2]= src[0]; src[2]= src[0];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment