[Mplayer-cvslog] CVS: main/libmpcodecs vd_qtrle.c,1.4,1.5

[Roberto Togni CVS]

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

Modified Files:
	vd_qtrle.c 
Log Message:
Quicktime rle 32 bit supported

Index: vd_qtrle.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_qtrle.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vd_qtrle.c	30 Aug 2002 21:44:20 -0000	1.4
+++ vd_qtrle.c	26 Jan 2003 22:04:59 -0000	1.5
@@ -32,7 +32,8 @@
 	    
 	    /* qtrle24 supports 32bit output too */
 	    if ((req_format == (IMGFMT_BGR|ctx->depth)) ||
-		((IMGFMT_BGR_DEPTH(req_format) == 32) && (ctx->depth == 24)))
+		((IMGFMT_BGR_DEPTH(req_format) == 32) && (ctx->depth == 24)) ||
+		((IMGFMT_BGR_DEPTH(req_format) == 24) && (ctx->depth == 32)))
 		return(CONTROL_TRUE);
 	    else
 		return(CONTROL_FALSE);
@@ -68,6 +69,8 @@
 	case 16:
 	    ctx->depth--; /* this is the trick ;) */
 	    break;
+  case 32:
+      mp_msg(MSGT_DECVIDEO,MSGL_INFO,"[qtrle] 32 bpp file, alpha channel will be ignored.\n");
 	case 24:
 	    break;
 	default: