[SCM] libav/experimental: fdct_mmx -> ff_fdct_mmx (renamed to avoid namespace conflict with xvid) [found by Kim Minh Kaplan]

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 3f09f52adf1ccdb93873f57570d8389316dc13ed
Author: Arpi <arpi at thot.banki.hu>
Date:   Thu Sep 19 22:14:53 2002 +0000

    fdct_mmx -> ff_fdct_mmx (renamed to avoid namespace conflict with xvid)
    [found by Kim Minh Kaplan]
    
    Originally committed as revision 960 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index a46223e..bff77d9 100644
--- a/libavcodec/dct-test.c
+++ b/libavcodec/dct-test.c
@@ -307,7 +307,7 @@ int main(int argc, char **argv)
         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 --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 1bc3a46..e7873c8 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -31,7 +31,7 @@ void ff_jpeg_fdct_islow (DCTELEM *data);
 
 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 --git a/libavcodec/i386/fdct_mmx.c b/libavcodec/i386/fdct_mmx.c
index e43871b..0ef1921 100644
--- a/libavcodec/i386/fdct_mmx.c
+++ b/libavcodec/i386/fdct_mmx.c
@@ -267,7 +267,7 @@ static inline void fdct_row(const int16_t *in, int16_t *out, const int16_t *tabl
     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 --git a/libavcodec/i386/mpegvideo_mmx.c b/libavcodec/i386/mpegvideo_mmx.c
index 10efc17..fc5ca55 100644
--- a/libavcodec/i386/mpegvideo_mmx.c
+++ b/libavcodec/i386/mpegvideo_mmx.c
@@ -560,7 +560,7 @@ void MPV_common_init_mmx(MpegEncContext *s)
         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 --git a/libavcodec/i386/mpegvideo_mmx_template.c b/libavcodec/i386/mpegvideo_mmx_template.c
index 27229ba..1eed906 100644
--- a/libavcodec/i386/mpegvideo_mmx_template.c
+++ b/libavcodec/i386/mpegvideo_mmx_template.c
@@ -41,7 +41,7 @@ static int RENAME(dct_quantize)(MpegEncContext *s,
     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;

-- 
Libav/FFmpeg packaging