Mercurial > mplayer.hg
changeset 10046:99aec27d3618
removed the last mp_msg :)
| author | alex |
|---|---|
| date | Thu, 01 May 2003 19:14:27 +0000 |
| parents | 688a206e17d4 |
| children | 07f4553269dd |
| files | postproc/swscale.c postproc/swscale_internal.h postproc/yuv2rgb.c |
| diffstat | 3 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/postproc/swscale.c Thu May 01 19:13:00 2003 +0000 +++ b/postproc/swscale.c Thu May 01 19:14:27 2003 +0000 @@ -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
--- a/postproc/swscale_internal.h Thu May 01 19:13:00 2003 +0000 +++ b/postproc/swscale_internal.h Thu May 01 19:14:27 2003 +0000 @@ -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,
--- a/postproc/yuv2rgb.c Thu May 01 19:13:00 2003 +0000 +++ b/postproc/yuv2rgb.c Thu May 01 19:14:27 2003 +0000 @@ -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; }