1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

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
This commit is contained in:
Vitor Sessak 2008-10-08 17:48:23 +00:00
parent 4900461742
commit e150ef8d34
2 changed files with 1 additions and 3 deletions

View File

@ -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_rgb[i]= b + (g<<8) + (r<<16);
}
src2[1]= (uint8_t*)c->pal_yuv;
}
// copy strides, so they can safely be modified

View File

@ -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 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, uint8_t* src[], int srcStride[], int s
int lastInChrBuf= c->lastInChrBuf;
if (isPacked(c->srcFormat)){
pal= (uint32_t *)src[1];
src[0]=
src[1]=
src[2]= src[0];