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.c | |
| parent | 4399e727237316c6491d800b7053dd44322c0ee7 (diff) | |
| parent | c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19 (diff) | |
| download | ffmpeg-5ff1b588eb4e639f0b3cfeff2118aadb2b43584a.tar.gz | |
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.c')
| -rw-r--r-- | libswscale/swscale.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 62916676db..7037c5b541 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -759,10 +759,10 @@ SwsFunc ff_getSwsFunc(SwsContext *c) { sws_init_swScale_c(c); + if (ARCH_PPC) + ff_sws_init_swscale_ppc(c); if (ARCH_X86) ff_sws_init_swscale_x86(c); - if (HAVE_ALTIVEC) - ff_sws_init_swScale_altivec(c); return swScale; } |