diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 15:41:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 15:41:05 +0200 |
| commit | c5cec9a42bec60894d63467cb0fd4976128d49af (patch) | |
| tree | c9e66838caee473a7d880bc88ab3f0544e2a7f16 /libswscale/swscale_unscaled.c | |
| parent | 5ff1b588eb4e639f0b3cfeff2118aadb2b43584a (diff) | |
| parent | 3aa682f25324d811ec284edc808eb71a46eae950 (diff) | |
Merge commit '3aa682f25324d811ec284edc808eb71a46eae950'
* commit '3aa682f25324d811ec284edc808eb71a46eae950':
swscale: consistent names for arch-specific acceleration functions
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 ed7abddc61..80a2da6b18 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1319,9 +1319,9 @@ void ff_get_unscaled_swscale(SwsContext *c) } if (ARCH_BFIN) - ff_bfin_get_unscaled_swscale(c); + ff_get_unscaled_swscale_bfin(c); if (ARCH_PPC) - ff_swscale_get_unscaled_ppc(c); + ff_get_unscaled_swscale_ppc(c); } /* Convert the palette to the same packed 32-bit format as the palette */ |