[Mplayer-cvslog] CVS: main/libmpcodecs vf_palette.c,1.6,1.7

Alex Beregszaszi alex at mplayerhq.hu
Mon Sep 9 18:14:07 CEST 2002


Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv13531

Modified Files:
	vf_palette.c 
Log Message:
10l

Index: vf_palette.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_palette.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vf_palette.c	30 Aug 2002 11:18:20 -0000	1.6
+++ vf_palette.c	9 Sep 2002 16:13:51 -0000	1.7
@@ -86,25 +86,25 @@
 	// no stride conversion needed
 	switch(dmpi->imgfmt&255){
 	case 15:
-	    if (mpi->flags & MP_IMGFLAG_SWAPPED)
+	    if (dmpi->flags & MP_IMGFLAG_SWAPPED)
 		palette8tobgr15(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
 	    else
 		palette8torgb15(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
 	    break;
 	case 16:
-	    if (mpi->flags & MP_IMGFLAG_SWAPPED)
+	    if (dmpi->flags & MP_IMGFLAG_SWAPPED)
 		palette8tobgr16(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
 	    else
 		palette8torgb16(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
 	    break;
 	case 24:
-	    if (mpi->flags & MP_IMGFLAG_SWAPPED)
+	    if (dmpi->flags & MP_IMGFLAG_SWAPPED)
 		palette8tobgr24(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
 	    else
 		palette8torgb24(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
 	    break;
 	case 32:
-	    if (mpi->flags & MP_IMGFLAG_SWAPPED)
+	    if (dmpi->flags & MP_IMGFLAG_SWAPPED)
 		palette8tobgr32(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
 	    else
 		palette8torgb32(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
@@ -117,25 +117,25 @@
 	    unsigned char* dst=dmpi->planes[0]+y*dmpi->stride[0];
 	    switch(dmpi->imgfmt&255){
 	    case 15:
-		if (mpi->flags & MP_IMGFLAG_SWAPPED)
+		if (dmpi->flags & MP_IMGFLAG_SWAPPED)
 		    palette8tobgr15(src,dst,mpi->w,mpi->planes[1]);
 		else
 		    palette8torgb15(src,dst,mpi->w,mpi->planes[1]);
 		break;
 	    case 16:
-		if (mpi->flags & MP_IMGFLAG_SWAPPED)
+		if (dmpi->flags & MP_IMGFLAG_SWAPPED)
 		    palette8tobgr16(src,dst,mpi->w,mpi->planes[1]);
 		else
 		    palette8torgb16(src,dst,mpi->w,mpi->planes[1]);
 		break;
 	    case 24:
-		if (mpi->flags & MP_IMGFLAG_SWAPPED)
+		if (dmpi->flags & MP_IMGFLAG_SWAPPED)
 		    palette8tobgr24(src,dst,mpi->w,mpi->planes[1]);
 		else
 		    palette8torgb24(src,dst,mpi->w,mpi->planes[1]);
 		break;
 	    case 32:
-		if (mpi->flags & MP_IMGFLAG_SWAPPED)
+		if (dmpi->flags & MP_IMGFLAG_SWAPPED)
 		    palette8tobgr32(src,dst,mpi->w,mpi->planes[1]);
 		else
 		    palette8torgb32(src,dst,mpi->w,mpi->planes[1]);




More information about the MPlayer-cvslog mailing list