[SCM] libav/experimental: cosmetics in dsp init

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 862b98d42c3a8bfdc5e8b5df017f329c9a022f3b
Author: Loren Merritt <lorenm at u.washington.edu>
Date:   Tue Aug 12 00:51:45 2008 +0000

    cosmetics in dsp init
    
    Originally committed as revision 14704 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c
index 81e2423..b15d42a 100644
--- a/libavcodec/i386/dsputil_mmx.c
+++ b/libavcodec/i386/dsputil_mmx.c
@@ -2683,19 +2683,17 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx)
         if(mm_flags & MM_SSE){
             c->vorbis_inverse_coupling = vorbis_inverse_coupling_sse;
             c->vector_fmul = vector_fmul_sse;
-            c->float_to_int16 = float_to_int16_sse;
-            c->float_to_int16_interleave = float_to_int16_interleave_sse;
             c->vector_fmul_reverse = vector_fmul_reverse_sse;
             c->vector_fmul_add_add = vector_fmul_add_add_sse;
             c->vector_fmul_window = vector_fmul_window_sse;
-        }
-        if(mm_flags & MM_SSE2){
-            c->float_to_int16 = float_to_int16_sse2;
-            c->float_to_int16_interleave = float_to_int16_interleave_sse2;
+            c->float_to_int16 = float_to_int16_sse;
+            c->float_to_int16_interleave = float_to_int16_interleave_sse;
         }
         if(mm_flags & MM_3DNOW)
             c->vector_fmul_add_add = vector_fmul_add_add_3dnow; // faster than sse
         if(mm_flags & MM_SSE2){
+            c->float_to_int16 = float_to_int16_sse2;
+            c->float_to_int16_interleave = float_to_int16_interleave_sse2;
             c->add_int16 = add_int16_sse2;
             c->sub_int16 = sub_int16_sse2;
             c->scalarproduct_int16 = scalarproduct_int16_sse2;

-- 
Libav/FFmpeg packaging