aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/x86/swresample_x86.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-28 13:01:50 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-28 13:15:44 +0200
commitfa5daaca0d6ffcfaa9e9d19089910ee7ebf9a8b7 (patch)
tree10688034a669c26a59a4371864b0f4dcd5e2da49 /libswresample/x86/swresample_x86.c
parentbcc66ff0e4ba50033804aaaf0eb1f92aab959c80 (diff)
downloadffmpeg-fa5daaca0d6ffcfaa9e9d19089910ee7ebf9a8b7.tar.gz
swr: seperate functions for aligned & unaligned
If someone has an idea on how to do this cleaner, its welcome Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/x86/swresample_x86.c')
-rw-r--r--libswresample/x86/swresample_x86.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libswresample/x86/swresample_x86.c b/libswresample/x86/swresample_x86.c
index 5c8d8290cd..f2a14c1faf 100644
--- a/libswresample/x86/swresample_x86.c
+++ b/libswresample/x86/swresample_x86.c
@@ -22,7 +22,7 @@
#include "libswresample/audioconvert.h"
#define MULTI_CAPS_FUNC_DECL(cap) \
- void ff_int16_to_int32_ ## cap(uint8_t **dst, const uint8_t **src, int len);
+ void ff_int16_to_int32_a_ ## cap(uint8_t **dst, const uint8_t **src, int len);
MULTI_CAPS_FUNC_DECL(mmx)
MULTI_CAPS_FUNC_DECL(sse)
@@ -39,7 +39,7 @@ void swri_audio_convert_init_x86(struct AudioConvert *ac,
#define MULTI_CAPS_FUNC(flag, cap) \
if (mm_flags & flag) {\
if( out_fmt == AV_SAMPLE_FMT_S32 && in_fmt == AV_SAMPLE_FMT_S16 || out_fmt == AV_SAMPLE_FMT_S32P && in_fmt == AV_SAMPLE_FMT_S16P)\
- ac->simd_f = ff_int16_to_int32_ ## cap;\
+ ac->simd_f = ff_int16_to_int32_a_ ## cap;\
}
MULTI_CAPS_FUNC(AV_CPU_FLAG_MMX, mmx)