Mercurial > mplayer.hg

changeset 27699:31a477d77c57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not set src[1] to the palette, it is now in the context
author vitor
date Wed, 08 Oct 2008 17:48:23 +0000
parents 2b4929069763
children e65738d7dd3b
files libswscale/swscale.c libswscale/swscale_template.c
diffstat 2 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libswscale/swscale.c	Wed Oct 08 17:46:22 2008 +0000
+++ b/libswscale/swscale.c	Wed Oct 08 17:48:23 2008 +0000
@@ -2741,7 +2741,6 @@
             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
--- a/libswscale/swscale_template.c	Wed Oct 08 17:46:22 2008 +0000
+++ b/libswscale/swscale_template.c	Wed Oct 08 17:48:23 2008 +0000
@@ -2926,7 +2926,7 @@
     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 @@
     int lastInChrBuf= c->lastInChrBuf;
 
     if (isPacked(c->srcFormat)){
-        pal= (uint32_t *)src[1];
         src[0]=
         src[1]=
         src[2]= src[0];