sync ffmpeg

- add wma decoder
- fix mmx macro
- remove changes from fdct_mmx.c (it should work fine now with the mmx macro fix)

CVS patchset: 3234
CVS date: 2002/11/11 13:45:34

1 files changed, 23 insertions, 23 deletions

diff --git a/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c b/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c
index 445500c50..e75f858a2 100644
--- a/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c
+++ b/src/libffmpeg/libavcodec/mlib/dsputil_mlib.c
@@ -223,30 +223,30 @@ static void ff_fdct_mlib(DCTELEM *data)
     mlib_VideoDCT8x8_S16_S16 (data, data);
 }
 
-void dsputil_init_mlib(void)
+void dsputil_init_mlib(DSPContext* c, unsigned mask)
 {
-    put_pixels_tab[0][0] = put_pixels16_mlib;
-    put_pixels_tab[0][1] = put_pixels16_x2_mlib;
-    put_pixels_tab[0][2] = put_pixels16_y2_mlib;
-    put_pixels_tab[0][3] = put_pixels16_xy2_mlib;
-    put_pixels_tab[1][0] = put_pixels8_mlib;
-    put_pixels_tab[1][1] = put_pixels8_x2_mlib;
-    put_pixels_tab[1][2] = put_pixels8_y2_mlib;
-    put_pixels_tab[1][3] = put_pixels8_xy2_mlib;
-
-    avg_pixels_tab[0][0] = avg_pixels16_mlib;
-    avg_pixels_tab[0][1] = avg_pixels16_x2_mlib;
-    avg_pixels_tab[0][2] = avg_pixels16_y2_mlib;
-    avg_pixels_tab[0][3] = avg_pixels16_xy2_mlib;
-    avg_pixels_tab[1][0] = avg_pixels8_mlib;
-    avg_pixels_tab[1][1] = avg_pixels8_x2_mlib;
-    avg_pixels_tab[1][2] = avg_pixels8_y2_mlib;
-    avg_pixels_tab[1][3] = avg_pixels8_xy2_mlib;
-    
-    put_no_rnd_pixels_tab[0][0] = put_pixels16_mlib;
-    put_no_rnd_pixels_tab[1][0] = put_pixels8_mlib;
-    
-    add_pixels_clamped = add_pixels_clamped_mlib;
+    c->put_pixels_tab[0][0] = put_pixels16_mlib;
+    c->put_pixels_tab[0][1] = put_pixels16_x2_mlib;
+    c->put_pixels_tab[0][2] = put_pixels16_y2_mlib;
+    c->put_pixels_tab[0][3] = put_pixels16_xy2_mlib;
+    c->put_pixels_tab[1][0] = put_pixels8_mlib;
+    c->put_pixels_tab[1][1] = put_pixels8_x2_mlib;
+    c->put_pixels_tab[1][2] = put_pixels8_y2_mlib;
+    c->put_pixels_tab[1][3] = put_pixels8_xy2_mlib;
+
+    c->avg_pixels_tab[0][0] = avg_pixels16_mlib;
+    c->avg_pixels_tab[0][1] = avg_pixels16_x2_mlib;
+    c->avg_pixels_tab[0][2] = avg_pixels16_y2_mlib;
+    c->avg_pixels_tab[0][3] = avg_pixels16_xy2_mlib;
+    c->avg_pixels_tab[1][0] = avg_pixels8_mlib;
+    c->avg_pixels_tab[1][1] = avg_pixels8_x2_mlib;
+    c->avg_pixels_tab[1][2] = avg_pixels8_y2_mlib;
+    c->avg_pixels_tab[1][3] = avg_pixels8_xy2_mlib;
+
+    c->put_no_rnd_pixels_tab[0][0] = put_pixels16_mlib;
+    c->put_no_rnd_pixels_tab[1][0] = put_pixels8_mlib;
+
+    c->add_pixels_clamped = add_pixels_clamped_mlib;
 }
 
 void MPV_common_init_mlib(MpegEncContext *s)