diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2003-05-01 19:14:27 +0000 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2003-05-01 19:14:27 +0000 |
| commit | b706b007a45d18ffac87fb26faa1dcd5df86ffa7 (patch) | |
| tree | 45eedd91fdca8101d768c30c579ebe97a9cfc458 /postproc | |
| parent | 5fe03e3837516732df41c339ebe471a86b6e8bd5 (diff) | |
| download | ffmpeg-streaming-b706b007a45d18ffac87fb26faa1dcd5df86ffa7.zip ffmpeg-streaming-b706b007a45d18ffac87fb26faa1dcd5df86ffa7.tar.gz | |
removed the last mp_msg :)
Originally committed as revision 10047 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
Diffstat (limited to 'postproc')
| -rw-r--r-- | postproc/swscale.c | 8 | ||||
| -rw-r--r-- | postproc/swscale_internal.h | 9 | ||||
| -rw-r--r-- | postproc/yuv2rgb.c | 5 |
3 files changed, 11 insertions, 11 deletions
diff --git a/postproc/swscale.c b/postproc/swscale.c index 4c787cc..6f3b0c3 100644 --- a/postproc/swscale.c +++ b/postproc/swscale.c @@ -68,14 +68,6 @@ untested special converters #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 diff --git a/postproc/swscale_internal.h b/postproc/swscale_internal.h index 85caead..606d8a1 100644 --- a/postproc/swscale_internal.h +++ b/postproc/swscale_internal.h @@ -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, diff --git a/postproc/yuv2rgb.c b/postproc/yuv2rgb.c index d4209cb..24295d0 100644 --- a/postproc/yuv2rgb.c +++ b/postproc/yuv2rgb.c @@ -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 @@ SwsFunc yuv2rgb_get_func_ptr (SwsContext *c) 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 @@ int yuv2rgb_c_init_tables (SwsContext *c, const int inv_table[4], int fullRange, 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; } |
