diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 16:38:51 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 16:42:34 +0400 |
| commit | db6b389c7f2176487cc4622a18f58e6b10af8e99 (patch) | |
| tree | caf15aa1b76925c7e152329af6d22c71523c12f4 /libswscale/swscale_internal.h | |
| parent | 477641e9f8a711b65a463ea75a4167b7cfdc84a5 (diff) | |
| parent | a519583991c38d38503ab08357716513facc5725 (diff) | |
Merge commit 'a519583991c38d38503ab08357716513facc5725'
* commit 'a519583991c38d38503ab08357716513facc5725':
swscale: x86: Hide arch-specific initialization details
Conflicts:
libswscale/x86/Makefile
libswscale/x86/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_internal.h')
| -rw-r--r-- | libswscale/swscale_internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index eaaed0e3c5..ef72f9fd70 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -616,7 +616,7 @@ void ff_yuv2rgb_init_tables_altivec(SwsContext *c, const int inv_table[4], void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufIndex, int lastInLumBuf, int lastInChrBuf); -SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c); +SwsFunc ff_yuv2rgb_init_x86(SwsContext *c); SwsFunc ff_yuv2rgb_init_vis(SwsContext *c); SwsFunc ff_yuv2rgb_init_altivec(SwsContext *c); SwsFunc ff_yuv2rgb_get_func_ptr_bfin(SwsContext *c); @@ -851,7 +851,7 @@ void ff_sws_init_output_funcs(SwsContext *c, yuv2packedX_fn *yuv2packedX, yuv2anyX_fn *yuv2anyX); void ff_sws_init_swScale_altivec(SwsContext *c); -void ff_sws_init_swScale_mmx(SwsContext *c); +void ff_sws_init_swscale_x86(SwsContext *c); static inline void fillPlane16(uint8_t *plane, int stride, int width, int height, int y, int alpha, int bits, const int big_endian) |