[MPlayer-cvslog] r27822 - trunk/libmpcodecs/vf_palette.c

uau subversion at mplayerhq.hu
Sat Oct 25 02:07:59 CEST 2008


Author: uau
Date: Sat Oct 25 02:07:59 2008
New Revision: 27822

Log:
vf_palette: Fix compilation after libswscale API changes

Patch from Guillaume Poirier. I didn't test the functionality of the
filter but at least it fixes compilation.

Modified:
   trunk/libmpcodecs/vf_palette.c

Modified: trunk/libmpcodecs/vf_palette.c
==============================================================================
--- trunk/libmpcodecs/vf_palette.c	(original)
+++ trunk/libmpcodecs/vf_palette.c	Sat Oct 25 02:07:59 2008
@@ -108,15 +108,15 @@ static int put_image(struct vf_instance_
 	    break;
 	case 24:
 	    if (IMGFMT_IS_BGR(dmpi->imgfmt))
-		palette8tobgr24(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
+		palette8topacked24(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]);
+		palette8topacked24(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
 	    break;
 	case 32:
 	    if (IMGFMT_IS_BGR(dmpi->imgfmt))
-		palette8tobgr32(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
+		palette8topacked32(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]);
+		palette8topacked32(mpi->planes[0],dmpi->planes[0],mpi->h*mpi->w,mpi->planes[1]);
 	    break;
 	}
     } else {
@@ -139,15 +139,15 @@ static int put_image(struct vf_instance_
 		break;
 	    case 24:
 		if (IMGFMT_IS_BGR(dmpi->imgfmt))
-		    palette8tobgr24(src,dst,mpi->w,mpi->planes[1]);
+		    palette8topacked24(src,dst,mpi->w,mpi->planes[1]);
 		else
-		    palette8torgb24(src,dst,mpi->w,mpi->planes[1]);
+		    palette8topacked24(src,dst,mpi->w,mpi->planes[1]);
 		break;
 	    case 32:
 		if (IMGFMT_IS_BGR(dmpi->imgfmt))
-		    palette8tobgr32(src,dst,mpi->w,mpi->planes[1]);
+		    palette8topacked32(src,dst,mpi->w,mpi->planes[1]);
 		else
-		    palette8torgb32(src,dst,mpi->w,mpi->planes[1]);
+		    palette8topacked32(src,dst,mpi->w,mpi->planes[1]);
 		break;
 	    }
 	}



More information about the MPlayer-cvslog mailing list