# HG changeset patch
# User arpi_esp
# Date 1032473693 0
# Node ID 9abb13c21fbeb15f702424fbd49a823494d2f1c3
# Parent  83d2c9d50d7dbc7b7e2e11e1338b125a8f283a14
fdct_mmx -> ff_fdct_mmx (renamed to avoid namespace conflict with xvid)
[found by Kim Minh Kaplan]

diff -r 83d2c9d50d7d -r 9abb13c21fbe dct-test.c
--- a/dct-test.c	Thu Sep 19 20:22:39 2002 +0000
+++ b/dct-test.c	Thu Sep 19 22:14:53 2002 +0000
@@ -307,7 +307,7 @@
         dct_error("REF-DBL", 0, fdct, fdct, test); /* only to verify code ! */
         dct_error("IJG-AAN-INT", 0, fdct_ifast, fdct, test);
         dct_error("IJG-LLM-INT", 0, ff_jpeg_fdct_islow, fdct, test);
-        dct_error("MMX", 0, fdct_mmx, fdct, test);
+        dct_error("MMX", 0, ff_fdct_mmx, fdct, test);
     } else {
         dct_error("REF-DBL", 1, idct, idct, test);
         dct_error("INT", 1, j_rev_dct, idct, test);
diff -r 83d2c9d50d7d -r 9abb13c21fbe dsputil.h
--- a/dsputil.h	Thu Sep 19 20:22:39 2002 +0000
+++ b/dsputil.h	Thu Sep 19 22:14:53 2002 +0000
@@ -31,7 +31,7 @@
 
 void j_rev_dct (DCTELEM *data);
 
-void fdct_mmx(DCTELEM *block);
+void ff_fdct_mmx(DCTELEM *block);
 
 /* encoding scans */
 extern UINT8 ff_alternate_horizontal_scan[64];
diff -r 83d2c9d50d7d -r 9abb13c21fbe i386/fdct_mmx.c
--- a/i386/fdct_mmx.c	Thu Sep 19 20:22:39 2002 +0000
+++ b/i386/fdct_mmx.c	Thu Sep 19 22:14:53 2002 +0000
@@ -267,7 +267,7 @@
     movq_r2m(mm6, *(out + 4));
 }
 
-void fdct_mmx(int16_t *block)
+void ff_fdct_mmx(int16_t *block)
 {
     /* XXX: not thread safe */
     static int16_t block_tmp[64] ATTR_ALIGN(8);
diff -r 83d2c9d50d7d -r 9abb13c21fbe i386/mpegvideo_mmx.c
--- a/i386/mpegvideo_mmx.c	Thu Sep 19 20:22:39 2002 +0000
+++ b/i386/mpegvideo_mmx.c	Thu Sep 19 22:14:53 2002 +0000
@@ -560,7 +560,7 @@
         draw_edges = draw_edges_mmx;
 
         if(dct_algo==FF_DCT_AUTO || dct_algo==FF_DCT_MMX){
-            s->fdct = fdct_mmx;
+            s->fdct = ff_fdct_mmx;
 
             if(mm_flags & MM_MMXEXT){
                 s->dct_quantize= dct_quantize_MMX2;
diff -r 83d2c9d50d7d -r 9abb13c21fbe i386/mpegvideo_mmx_template.c
--- a/i386/mpegvideo_mmx_template.c	Thu Sep 19 20:22:39 2002 +0000
+++ b/i386/mpegvideo_mmx_template.c	Thu Sep 19 22:14:53 2002 +0000
@@ -41,7 +41,7 @@
     static __align8 INT16 temp_block[64];
 
     //s->fdct (block);
-    fdct_mmx (block); //cant be anything else ...
+    ff_fdct_mmx (block); //cant be anything else ...
 
     if (s->mb_intra) {
         int dummy;