From bc04b5141eba9239af111b0d74c45d8f5603d4cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Mon, 13 Sep 2010 18:27:49 +0000 Subject: [PATCH] Disable float_to_int16_interleave_sse2 in favor of float_to_int16_interleave_sse, since it crashes for reasons I would have no clue about. Fixes a few duplicated tickets, which I'll have to sort out later. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38636 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c index 804b6ab73b..a2512010a9 100644 --- a/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c +++ b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c @@ -2878,7 +2878,9 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx) if(mm_flags & FF_MM_SSE2){ c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_sse2; c->float_to_int16 = float_to_int16_sse2; - c->float_to_int16_interleave = float_to_int16_interleave_sse2; +// NOTE (Haiku modification): Disabled because it crashes. +// c->float_to_int16_interleave = float_to_int16_interleave_sse2; + c->float_to_int16_interleave = float_to_int16_interleave_sse; #if HAVE_YASM c->scalarproduct_int16 = ff_scalarproduct_int16_sse2; c->scalarproduct_and_madd_int16 = ff_scalarproduct_and_madd_int16_sse2;