diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 17:10:09 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 17:10:09 +0400 |
| commit | 5ff1b588eb4e639f0b3cfeff2118aadb2b43584a (patch) | |
| tree | 3a23e041ee9ffa0e5c1f9e73f7c75e4dfae5f623 /libswscale/swscale_internal.h | |
| parent | 4399e727237316c6491d800b7053dd44322c0ee7 (diff) | |
| parent | c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19 (diff) | |
Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19'
* commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19':
swscale: ppc: Hide arch-specific initialization details
Conflicts:
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_internal.h')
| -rw-r--r-- | libswscale/swscale_internal.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index ef72f9fd70..3ff31ceacc 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -610,15 +610,15 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c); int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int fullRange, int brightness, int contrast, int saturation); +void ff_yuv2rgb_init_tables_ppc(SwsContext *c, const int inv_table[4], + int brightness, int contrast, int saturation); -void ff_yuv2rgb_init_tables_altivec(SwsContext *c, const int inv_table[4], - int brightness, int contrast, int saturation); void updateMMXDitherTables(SwsContext *c, int dstY, int lumBufIndex, int chrBufIndex, int lastInLumBuf, int lastInChrBuf); SwsFunc ff_yuv2rgb_init_x86(SwsContext *c); SwsFunc ff_yuv2rgb_init_vis(SwsContext *c); -SwsFunc ff_yuv2rgb_init_altivec(SwsContext *c); +SwsFunc ff_yuv2rgb_init_ppc(SwsContext *c); SwsFunc ff_yuv2rgb_get_func_ptr_bfin(SwsContext *c); void ff_bfin_get_unscaled_swscale(SwsContext *c); @@ -833,7 +833,7 @@ extern const AVClass sws_context_class; */ void ff_get_unscaled_swscale(SwsContext *c); -void ff_swscale_get_unscaled_altivec(SwsContext *c); +void ff_swscale_get_unscaled_ppc(SwsContext *c); /** * Return function pointer to fastest main scaler path function depending @@ -850,7 +850,7 @@ void ff_sws_init_output_funcs(SwsContext *c, yuv2packed2_fn *yuv2packed2, yuv2packedX_fn *yuv2packedX, yuv2anyX_fn *yuv2anyX); -void ff_sws_init_swScale_altivec(SwsContext *c); +void ff_sws_init_swscale_ppc(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, |