Originally committed as revision 10047 to svn://svn.mplayerhq.hu/mplayer/trunk/postproctags/v0.5
| @@ -68,14 +68,6 @@ untested special converters | |||||
| #include "../libvo/img_format.h" | #include "../libvo/img_format.h" | ||||
| #include "rgb2rgb.h" | #include "rgb2rgb.h" | ||||
| #include "../libvo/fastmemcpy.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 MOVNTQ | ||||
| #undef PAVGB | #undef PAVGB | ||||
| @@ -19,6 +19,15 @@ | |||||
| #ifndef SWSCALE_INTERNAL_H | #ifndef SWSCALE_INTERNAL_H | ||||
| #define 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 | #define MAX_FILTER_SIZE 256 | ||||
| typedef int (*SwsFunc)(struct SwsContext *context, uint8_t* src[], int srcStride[], int srcSliceY, | typedef int (*SwsFunc)(struct SwsContext *context, uint8_t* src[], int srcStride[], int srcSliceY, | ||||
| @@ -41,7 +41,6 @@ | |||||
| #include "swscale.h" | #include "swscale.h" | ||||
| #include "swscale_internal.h" | #include "swscale_internal.h" | ||||
| #include "../mangle.h" | #include "../mangle.h" | ||||
| #include "../mp_msg.h" | |||||
| #include "../libvo/img_format.h" //FIXME try to reduce dependency of such stuff | #include "../libvo/img_format.h" //FIXME try to reduce dependency of such stuff | ||||
| #ifdef HAVE_MLIB | #ifdef HAVE_MLIB | ||||
| @@ -608,7 +607,7 @@ SwsFunc yuv2rgb_get_func_ptr (SwsContext *c) | |||||
| if(t) return t; | if(t) return t; | ||||
| } | } | ||||
| #endif | #endif | ||||
| mp_msg(MSGT_SWS,MSGL_WARN,"No accelerated colorspace conversion found\n"); | |||||
| MSG_WARN("No accelerated colorspace conversion found\n"); | |||||
| switch(c->dstFormat){ | switch(c->dstFormat){ | ||||
| case IMGFMT_RGB32: | case IMGFMT_RGB32: | ||||
| @@ -826,7 +825,7 @@ int yuv2rgb_c_init_tables (SwsContext *c, const int inv_table[4], int fullRange, | |||||
| default: | default: | ||||
| table_start= NULL; | 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? | //free mem? | ||||
| return -1; | return -1; | ||||
| } | } | ||||