diff options
author | vitor <vitor@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-10-08 17:48:23 +0000 |
---|---|---|
committer | vitor <vitor@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-10-08 17:48:23 +0000 |
commit | 74bb6be453fb896a48d16254cf55449b58052d0b (patch) | |
tree | 2e7c5540923f3c90c9f6e3a0fe276eab6e4dd1a3 /libswscale | |
parent | c51fe849d6237c7de2e1de341761d4f01848a002 (diff) | |
download | mpv-74bb6be453fb896a48d16254cf55449b58052d0b.tar.bz2 mpv-74bb6be453fb896a48d16254cf55449b58052d0b.tar.xz |
Do not set src[1] to the palette, it is now in the context
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27731 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libswscale')
-rw-r--r-- | libswscale/swscale.c | 1 | ||||
-rw-r--r-- | libswscale/swscale_template.c | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 35015df78e..f3afb16695 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -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 diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c index e96263b6b6..4d8a4434ee 100644 --- a/libswscale/swscale_template.c +++ b/libswscale/swscale_template.c @@ -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]; |