From ab3f56987f7f26e5a8fcb81c0236e4c514110ba9 Mon Sep 17 00:00:00 2001 From: kostya Date: Mon, 9 Feb 2009 14:31:53 +0000 Subject: Prefix visible YUV2RGB functions with sws_ git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28496 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale_internal.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libswscale/swscale_internal.h') diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 38db01023a..ebd1fb5117 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -212,11 +212,11 @@ typedef struct SwsContext{ } SwsContext; //FIXME check init (where 0) -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); +SwsFunc sws_yuv2rgb_get_func_ptr (SwsContext *c); +int sws_yuv2rgb_c_init_tables (SwsContext *c, const int inv_table[4], int fullRange, int brightness, int contrast, int saturation); -void yuv2rgb_altivec_init_tables (SwsContext *c, const int inv_table[4],int brightness,int contrast, int saturation); -SwsFunc yuv2rgb_init_altivec (SwsContext *c); +void sws_yuv2rgb_altivec_init_tables (SwsContext *c, const int inv_table[4],int brightness,int contrast, int saturation); +SwsFunc sws_yuv2rgb_init_altivec (SwsContext *c); void altivec_yuv2packedX (SwsContext *c, int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize, -- cgit v1.2.3 From 60ae9c589574c19a5cd59039f11845b6d62e74d3 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 9 Feb 2009 17:53:33 +0000 Subject: Drop DECLARE_ALIGNED from extern declarations. It creates trouble when swscale_internal.h is #included without HAVE_AV_CONFIG_H defined. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28498 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale_internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libswscale/swscale_internal.h') diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index ebd1fb5117..cf157428b3 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -309,8 +309,8 @@ static inline int fmt_depth(int fmt) } } -extern const DECLARE_ALIGNED(8, uint64_t, ff_dither4[2]); -extern const DECLARE_ALIGNED(8, uint64_t, ff_dither8[2]); +extern const uint64_t ff_dither4[2]; +extern const uint64_t ff_dither8[2]; extern const AVClass sws_context_class; -- cgit v1.2.3