[haiku-commits] Re: r38636 - haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86
- From: scott mc <scottmc2@xxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 13 Sep 2010 12:40:37 -0700
On Mon, Sep 13, 2010 at 11:27 AM, <superstippi@xxxxxx> wrote:
> Author: stippi
> Date: 2010-09-13 20:27:49 +0200 (Mon, 13 Sep 2010)
> New Revision: 38636
> Changeset: http://dev.haiku-os.org/changeset/38636
>
> Modified:
> haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c
> Log:
> 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.
>
>
> Modified:
> haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c
> ===================================================================
> --- haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c
> 2010-09-13 16:19:07 UTC (rev 38635)
> +++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c
> 2010-09-13 18:27:49 UTC (rev 38636)
> @@ -2878,7 +2878,9 @@
> 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;
>
>
>
For fixes like this, perhaps ifdef it for __HAIKU__ so that the code
can be upstreamed and we won't have to redo the changes when updating
to the next version.
-scottmc
Other related posts:
