# HG changeset patch
# User rbultje
# Date 1283185347 0
# Node ID fe78a4548d1201c26427ebd821dea563140c112a
# Parent  7915312dd8623f3485150cdceb87b9fdd5545a62
Put ff_ prefix on non-static {put_signed,put,add}_pixels_clamped_mmx()
functions.

diff -r 7915312dd862 -r fe78a4548d12 x86/cavsdsp_mmx.c
--- a/x86/cavsdsp_mmx.c	Sun Aug 29 15:46:38 2010 +0000
+++ b/x86/cavsdsp_mmx.c	Mon Aug 30 16:22:27 2010 +0000
@@ -173,7 +173,7 @@
         );
     }
 
-    add_pixels_clamped_mmx(b2, dst, stride);
+    ff_add_pixels_clamped_mmx(b2, dst, stride);
 }
 
 /*****************************************************************************
diff -r 7915312dd862 -r fe78a4548d12 x86/dsputil_mmx.c
--- a/x86/dsputil_mmx.c	Sun Aug 29 15:46:38 2010 +0000
+++ b/x86/dsputil_mmx.c	Mon Aug 30 16:22:27 2010 +0000
@@ -228,7 +228,7 @@
 /***********************************/
 /* standard MMX */
 
-void put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size)
+void ff_put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size)
 {
     const DCTELEM *p;
     uint8_t *pix;
@@ -304,7 +304,7 @@
             "movq %%mm3, (%0, %3, 2)            \n\t"\
             "movq %%mm4, (%0, %1)               \n\t"
 
-void put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size)
+void ff_put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size)
 {
     x86_reg line_skip = line_size;
     x86_reg line_skip3;
@@ -320,7 +320,7 @@
             :"memory");
 }
 
-void add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size)
+void ff_add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size)
 {
     const DCTELEM *p;
     uint8_t *pix;
@@ -1851,43 +1851,43 @@
 static void ff_libmpeg2mmx_idct_put(uint8_t *dest, int line_size, DCTELEM *block)
 {
     ff_mmx_idct (block);
-    put_pixels_clamped_mmx(block, dest, line_size);
+    ff_put_pixels_clamped_mmx(block, dest, line_size);
 }
 static void ff_libmpeg2mmx_idct_add(uint8_t *dest, int line_size, DCTELEM *block)
 {
     ff_mmx_idct (block);
-    add_pixels_clamped_mmx(block, dest, line_size);
+    ff_add_pixels_clamped_mmx(block, dest, line_size);
 }
 static void ff_libmpeg2mmx2_idct_put(uint8_t *dest, int line_size, DCTELEM *block)
 {
     ff_mmxext_idct (block);
-    put_pixels_clamped_mmx(block, dest, line_size);
+    ff_put_pixels_clamped_mmx(block, dest, line_size);
 }
 static void ff_libmpeg2mmx2_idct_add(uint8_t *dest, int line_size, DCTELEM *block)
 {
     ff_mmxext_idct (block);
-    add_pixels_clamped_mmx(block, dest, line_size);
+    ff_add_pixels_clamped_mmx(block, dest, line_size);
 }
 #endif
 static void ff_idct_xvid_mmx_put(uint8_t *dest, int line_size, DCTELEM *block)
 {
     ff_idct_xvid_mmx (block);
-    put_pixels_clamped_mmx(block, dest, line_size);
+    ff_put_pixels_clamped_mmx(block, dest, line_size);
 }
 static void ff_idct_xvid_mmx_add(uint8_t *dest, int line_size, DCTELEM *block)
 {
     ff_idct_xvid_mmx (block);
-    add_pixels_clamped_mmx(block, dest, line_size);
+    ff_add_pixels_clamped_mmx(block, dest, line_size);
 }
 static void ff_idct_xvid_mmx2_put(uint8_t *dest, int line_size, DCTELEM *block)
 {
     ff_idct_xvid_mmx2 (block);
-    put_pixels_clamped_mmx(block, dest, line_size);
+    ff_put_pixels_clamped_mmx(block, dest, line_size);
 }
 static void ff_idct_xvid_mmx2_add(uint8_t *dest, int line_size, DCTELEM *block)
 {
     ff_idct_xvid_mmx2 (block);
-    add_pixels_clamped_mmx(block, dest, line_size);
+    ff_add_pixels_clamped_mmx(block, dest, line_size);
 }
 
 static void vorbis_inverse_coupling_3dnow(float *mag, float *ang, int blocksize)
@@ -2579,9 +2579,9 @@
             }
         }
 
-        c->put_pixels_clamped = put_pixels_clamped_mmx;
-        c->put_signed_pixels_clamped = put_signed_pixels_clamped_mmx;
-        c->add_pixels_clamped = add_pixels_clamped_mmx;
+        c->put_pixels_clamped = ff_put_pixels_clamped_mmx;
+        c->put_signed_pixels_clamped = ff_put_signed_pixels_clamped_mmx;
+        c->add_pixels_clamped = ff_add_pixels_clamped_mmx;
         c->clear_block  = clear_block_mmx;
         c->clear_blocks = clear_blocks_mmx;
         if ((mm_flags & FF_MM_SSE) &&
diff -r 7915312dd862 -r fe78a4548d12 x86/dsputil_mmx.h
--- a/x86/dsputil_mmx.h	Sun Aug 29 15:46:38 2010 +0000
+++ b/x86/dsputil_mmx.h	Mon Aug 30 16:22:27 2010 +0000
@@ -158,9 +158,9 @@
 void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx);
 void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx);
 
-void add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
-void put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
-void put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
+void ff_add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
+void ff_put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
+void ff_put_signed_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size);
 
 void ff_put_cavs_qpel8_mc00_mmx2(uint8_t *dst, uint8_t *src, int stride);
 void ff_avg_cavs_qpel8_mc00_mmx2(uint8_t *dst, uint8_t *src, int stride);
diff -r 7915312dd862 -r fe78a4548d12 x86/h264dsp_mmx.c
--- a/x86/h264dsp_mmx.c	Sun Aug 29 15:46:38 2010 +0000
+++ b/x86/h264dsp_mmx.c	Mon Aug 30 16:22:27 2010 +0000
@@ -212,7 +212,7 @@
         );
     }
 
-    add_pixels_clamped_mmx(b2, dst, stride);
+    ff_add_pixels_clamped_mmx(b2, dst, stride);
 }
 
 #define STORE_DIFF_8P( p, d, t, z )\
diff -r 7915312dd862 -r fe78a4548d12 x86/idct_sse2_xvid.c
--- a/x86/idct_sse2_xvid.c	Sun Aug 29 15:46:38 2010 +0000
+++ b/x86/idct_sse2_xvid.c	Mon Aug 30 16:22:27 2010 +0000
@@ -385,11 +385,11 @@
 void ff_idct_xvid_sse2_put(uint8_t *dest, int line_size, short *block)
 {
     ff_idct_xvid_sse2(block);
-    put_pixels_clamped_mmx(block, dest, line_size);
+    ff_put_pixels_clamped_mmx(block, dest, line_size);
 }
 
 void ff_idct_xvid_sse2_add(uint8_t *dest, int line_size, short *block)
 {
     ff_idct_xvid_sse2(block);
-    add_pixels_clamped_mmx(block, dest, line_size);
+    ff_add_pixels_clamped_mmx(block, dest, line_size);
 }
diff -r 7915312dd862 -r fe78a4548d12 x86/simple_idct_mmx.c
--- a/x86/simple_idct_mmx.c	Sun Aug 29 15:46:38 2010 +0000
+++ b/x86/simple_idct_mmx.c	Mon Aug 30 16:22:27 2010 +0000
@@ -1287,10 +1287,10 @@
 void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, DCTELEM *block)
 {
     idct(block);
-    put_pixels_clamped_mmx(block, dest, line_size);
+    ff_put_pixels_clamped_mmx(block, dest, line_size);
 }
 void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block)
 {
     idct(block);
-    add_pixels_clamped_mmx(block, dest, line_size);
+    ff_add_pixels_clamped_mmx(block, dest, line_size);
 }
diff -r 7915312dd862 -r fe78a4548d12 x86/vp3dsp_mmx.c
--- a/x86/vp3dsp_mmx.c	Sun Aug 29 15:46:38 2010 +0000
+++ b/x86/vp3dsp_mmx.c	Mon Aug 30 16:22:27 2010 +0000
@@ -387,13 +387,13 @@
 void ff_vp3_idct_put_mmx(uint8_t *dest, int line_size, DCTELEM *block)
 {
     ff_vp3_idct_mmx(block);
-    put_signed_pixels_clamped_mmx(block, dest, line_size);
+    ff_put_signed_pixels_clamped_mmx(block, dest, line_size);
 }
 
 void ff_vp3_idct_add_mmx(uint8_t *dest, int line_size, DCTELEM *block)
 {
     ff_vp3_idct_mmx(block);
-    add_pixels_clamped_mmx(block, dest, line_size);
+    ff_add_pixels_clamped_mmx(block, dest, line_size);
 }
 
 void ff_vp3_idct_dc_add_mmx2(uint8_t *dest, int linesize, const DCTELEM *block)
diff -r 7915312dd862 -r fe78a4548d12 x86/vp3dsp_sse2.c
--- a/x86/vp3dsp_sse2.c	Sun Aug 29 15:46:38 2010 +0000
+++ b/x86/vp3dsp_sse2.c	Mon Aug 30 16:22:27 2010 +0000
@@ -177,11 +177,11 @@
 void ff_vp3_idct_put_sse2(uint8_t *dest, int line_size, DCTELEM *block)
 {
     ff_vp3_idct_sse2(block);
-    put_signed_pixels_clamped_mmx(block, dest, line_size);
+    ff_put_signed_pixels_clamped_mmx(block, dest, line_size);
 }
 
 void ff_vp3_idct_add_sse2(uint8_t *dest, int line_size, DCTELEM *block)
 {
     ff_vp3_idct_sse2(block);
-    add_pixels_clamped_mmx(block, dest, line_size);
+    ff_add_pixels_clamped_mmx(block, dest, line_size);
 }