diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 15:10:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 15:10:09 +0200 |
| commit | 5ff1b588eb4e639f0b3cfeff2118aadb2b43584a (patch) | |
| tree | 3a23e041ee9ffa0e5c1f9e73f7c75e4dfae5f623 /libswscale/swscale_unscaled.c | |
| 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_unscaled.c')
| -rw-r--r-- | libswscale/swscale_unscaled.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index b2b792fefd..ed7abddc61 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1320,8 +1320,8 @@ void ff_get_unscaled_swscale(SwsContext *c) if (ARCH_BFIN) ff_bfin_get_unscaled_swscale(c); - if (HAVE_ALTIVEC) - ff_swscale_get_unscaled_altivec(c); + if (ARCH_PPC) + ff_swscale_get_unscaled_ppc(c); } /* Convert the palette to the same packed 32-bit format as the palette */ |