diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 21:21:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 21:50:37 +0200 |
| commit | 367d9b2957fa455b59f131fd6bee896cb7ed6600 (patch) | |
| tree | 4c6f6a32752bc64d7aea93e37d4bd5666cd6ecb9 /libavcodec/x86/ac3dsp.asm | |
| parent | 62e5ef95cacb29b5ee3149792f12f9204dbd1655 (diff) | |
| parent | ef0ee7f657e66d91162d2b4fad882ece9fbb264e (diff) | |
| download | ffmpeg-367d9b2957fa455b59f131fd6bee896cb7ed6600.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: K&R formatting cosmetics (part II)
tiffdec: Add a malloc check and refactor another.
faxcompr: Check malloc results and unify return path
configure: escape colons in values written to config.fate
ac3dsp: call femms/emms at the end of float_to_fixed24() for 3DNow and SSE
matroska: Fix leaking memory allocated for laces.
pthread: Fix crash due to fctx->delaying not being cleared.
vp3: Assert on invalid filter_limit values.
h264: fix 10bit biweight functions after recent x86inc.asm fixes.
ffv1: Fix size mismatch in encode_line.
movenc: Remove a dead initialization
git-howto: Explain how to avoid Windows line endings in git checkouts.
build: Move all arch OBJS declarations into arch subdirectory Makefiles.
Conflicts:
configure
libavcodec/vp3.c
libavformat/matroskadec.c
libavutil/Makefile
libswscale/Makefile
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/ac3dsp.asm')
| -rw-r--r-- | libavcodec/x86/ac3dsp.asm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/x86/ac3dsp.asm b/libavcodec/x86/ac3dsp.asm index a7380f9bd8..99e121ec68 100644 --- a/libavcodec/x86/ac3dsp.asm +++ b/libavcodec/x86/ac3dsp.asm @@ -223,7 +223,8 @@ cglobal float_to_fixed24_3dnow, 3,3,0, dst, src, len add dstq, 32 sub lend, 8 ja .loop - REP_RET + femms + RET INIT_XMM cglobal float_to_fixed24_sse, 3,3,3, dst, src, len @@ -247,7 +248,8 @@ cglobal float_to_fixed24_sse, 3,3,3, dst, src, len add dstq, 32 sub lend, 8 ja .loop - REP_RET + emms + RET INIT_XMM cglobal float_to_fixed24_sse2, 3,3,9, dst, src, len |