[Mplayer-cvslog] CVS: main/postproc swscale.c,1.125,1.126 swscale_internal.h,1.4,1.5 yuv2rgb.c,1.20,1.21

[Alex Beregszaszi]

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

Modified Files:
	swscale.c swscale_internal.h yuv2rgb.c 
Log Message:
removed the last mp_msg :)

Index: swscale.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- swscale.c	25 Apr 2003 17:16:55 -0000	1.125
+++ swscale.c	1 May 2003 19:14:27 -0000	1.126
@@ -68,14 +68,6 @@
 #include "../libvo/img_format.h"
 #include "rgb2rgb.h"
 #include "../libvo/fastmemcpy.h"
-#include "../mp_msg.h"
-
-#define MSG_WARN(args...) mp_msg(MSGT_SWS,MSGL_WARN, ##args )
-#define MSG_FATAL(args...) mp_msg(MSGT_SWS,MSGL_FATAL, ##args )
-#define MSG_ERR(args...) mp_msg(MSGT_SWS,MSGL_ERR, ##args )
-#define MSG_V(args...) mp_msg(MSGT_SWS,MSGL_V, ##args )
-#define MSG_DBG2(args...) mp_msg(MSGT_SWS,MSGL_DBG2, ##args )
-#define MSG_INFO(args...) mp_msg(MSGT_SWS,MSGL_INFO, ##args )
 
 #undef MOVNTQ
 #undef PAVGB

Index: swscale_internal.h
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/swscale_internal.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- swscale_internal.h	27 Mar 2003 16:04:53 -0000	1.4
+++ swscale_internal.h	1 May 2003 19:14:27 -0000	1.5
@@ -19,6 +19,15 @@
 #ifndef SWSCALE_INTERNAL_H
 #define SWSCALE_INTERNAL_H
 
+#include "../mp_msg.h"
+
+#define MSG_WARN(args...) mp_msg(MSGT_SWS,MSGL_WARN, ##args )
+#define MSG_FATAL(args...) mp_msg(MSGT_SWS,MSGL_FATAL, ##args )
+#define MSG_ERR(args...) mp_msg(MSGT_SWS,MSGL_ERR, ##args )
+#define MSG_V(args...) mp_msg(MSGT_SWS,MSGL_V, ##args )
+#define MSG_DBG2(args...) mp_msg(MSGT_SWS,MSGL_DBG2, ##args )
+#define MSG_INFO(args...) mp_msg(MSGT_SWS,MSGL_INFO, ##args )
+
 #define MAX_FILTER_SIZE 256
 
 typedef int (*SwsFunc)(struct SwsContext *context, uint8_t* src[], int srcStride[], int srcSliceY,

Index: yuv2rgb.c
===================================================================
RCS file: /cvsroot/mplayer/main/postproc/yuv2rgb.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- yuv2rgb.c	25 Apr 2003 17:16:55 -0000	1.20
+++ yuv2rgb.c	1 May 2003 19:14:27 -0000	1.21
@@ -41,7 +41,6 @@
 #include "swscale.h"
 #include "swscale_internal.h"
 #include "../mangle.h"
-#include "../mp_msg.h"
 #include "../libvo/img_format.h" //FIXME try to reduce dependency of such stuff
 
 #ifdef HAVE_MLIB
@@ -608,7 +607,7 @@
 	if(t) return t;
     }
 #endif
-    mp_msg(MSGT_SWS,MSGL_WARN,"No accelerated colorspace conversion found\n");
+    MSG_WARN("No accelerated colorspace conversion found\n");
 
     switch(c->dstFormat){
     case IMGFMT_RGB32:
@@ -826,7 +825,7 @@
 
     default:
 	table_start= NULL;
-	mp_msg(MSGT_SWS,MSGL_ERR,"%ibpp not supported by yuv2rgb\n", bpp);
+	MSG_ERR("%ibpp not supported by yuv2rgb\n", bpp);
 	//free mem?
 	return -1;
     }