diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 14:38:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-29 14:42:34 +0200 |
| commit | db6b389c7f2176487cc4622a18f58e6b10af8e99 (patch) | |
| tree | caf15aa1b76925c7e152329af6d22c71523c12f4 /libswscale/swscale.c | |
| parent | 477641e9f8a711b65a463ea75a4167b7cfdc84a5 (diff) | |
| parent | a519583991c38d38503ab08357716513facc5725 (diff) | |
| download | ffmpeg-db6b389c7f2176487cc4622a18f58e6b10af8e99.tar.gz | |
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.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 c61989f8a6..62916676db 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -759,8 +759,8 @@ SwsFunc ff_getSwsFunc(SwsContext *c) { sws_init_swScale_c(c); - if (HAVE_MMX) - ff_sws_init_swScale_mmx(c); + if (ARCH_X86) + ff_sws_init_swscale_x86(c); if (HAVE_ALTIVEC) ff_sws_init_swScale_altivec(c); |