diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-12 04:17:55 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-12 04:17:55 +0200 |
commit | 1e869638280f962fb80f372d152234f21246c2af (patch) | |
tree | 64657f88e7902aa000f44f40be4f8e575f58c8de /libswscale/swscale_internal.h | |
parent | 9790f4e6e72cdc8093be966d3d6e007c8f44a035 (diff) | |
parent | 379b176f25905f273a368336c3f5f287eeea51a2 (diff) | |
download | mpv-1e869638280f962fb80f372d152234f21246c2af.tar.bz2 mpv-1e869638280f962fb80f372d152234f21246c2af.tar.xz |
Merge svn changes up to r28537
Diffstat (limited to 'libswscale/swscale_internal.h')
-rw-r--r-- | libswscale/swscale_internal.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 38db01023a..cf157428b3 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, @@ -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; |