From 94c4def23c3b212dd0f8fde902cecf47e5bee1c2 Mon Sep 17 00:00:00 2001 From: Luca Abeni Date: Thu, 20 Jul 2006 12:13:57 +0000 Subject: Use libavutil in libswscale, and allow it to be built out of the mplayer tree Originally committed as revision 19148 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale --- libswscale/swscale_internal.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'libswscale/swscale_internal.h') diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 5bccd62b6e..bc8f08d1db 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -23,20 +23,20 @@ #include #endif +#include "avutil.h" + #ifdef CONFIG_DARWIN #define AVV(x...) (x) #else #define AVV(x...) {x} #endif -#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 MSG_WARN(args...) av_log(NULL, AV_LOG_DEBUG, ##args ) +#define MSG_FATAL(args...) av_log(NULL, AV_LOG_ERROR, ##args ) +#define MSG_ERR(args...) av_log(NULL, AV_LOG_ERROR, ##args ) +#define MSG_V(args...) av_log(NULL, AV_LOG_INFO, ##args ) +#define MSG_DBG2(args...) av_log(NULL, AV_LOG_DEBUG, ##args ) +#define MSG_INFO(args...) av_log(NULL, AV_LOG_INFO, ##args ) #define MAX_FILTER_SIZE 256 @@ -164,4 +164,6 @@ typedef struct SwsContext{ SwsFunc yuv2rgb_get_func_ptr (SwsContext *c); int yuv2rgb_c_init_tables (SwsContext *c, const int inv_table[4], int fullRange, int brightness, int contrast, int saturation); +char *sws_format_name(int format); + #endif -- cgit v1.2.3