[FFmpeg-cvslog] sh4: Add ff_ prefix to nonstatic symbols

Martin Storsjö git at videolan.org
Thu Feb 16 01:47:03 CET 2012


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Feb 15 14:15:40 2012 +0200| [f73673a770215f2f601ebb6e75d264533f738cc4] | committer: Martin Storsjö

sh4: Add ff_ prefix to nonstatic symbols

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f73673a770215f2f601ebb6e75d264533f738cc4
---

 libavcodec/sh4/dsputil_sh4.c |    6 +++---
 libavcodec/sh4/dsputil_sh4.h |    2 +-
 libavcodec/sh4/idct_sh4.c    |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavcodec/sh4/dsputil_sh4.c b/libavcodec/sh4/dsputil_sh4.c
index 6accb27..74c8670 100644
--- a/libavcodec/sh4/dsputil_sh4.c
+++ b/libavcodec/sh4/dsputil_sh4.c
@@ -56,7 +56,7 @@ static void idct_put(uint8_t *dest, int line_size, DCTELEM *block)
 {
         int i;
         uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
-        idct_sh4(block);
+        ff_idct_sh4(block);
         for(i=0;i<8;i++) {
                 dest[0] = cm[block[0]];
                 dest[1] = cm[block[1]];
@@ -74,7 +74,7 @@ static void idct_add(uint8_t *dest, int line_size, DCTELEM *block)
 {
         int i;
         uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
-        idct_sh4(block);
+        ff_idct_sh4(block);
         for(i=0;i<8;i++) {
                 dest[0] = cm[dest[0]+block[0]];
                 dest[1] = cm[dest[1]+block[1]];
@@ -101,7 +101,7 @@ void ff_dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx)
             (idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_SH4)) {
                 c->idct_put = idct_put;
                 c->idct_add = idct_add;
-               c->idct     = idct_sh4;
+                c->idct     = ff_idct_sh4;
                 c->idct_permutation_type= FF_NO_IDCT_PERM;
         }
 }
diff --git a/libavcodec/sh4/dsputil_sh4.h b/libavcodec/sh4/dsputil_sh4.h
index c838c4d..7e8ebbc 100644
--- a/libavcodec/sh4/dsputil_sh4.h
+++ b/libavcodec/sh4/dsputil_sh4.h
@@ -22,7 +22,7 @@
 #include "libavcodec/avcodec.h"
 #include "libavcodec/dsputil.h"
 
-void idct_sh4(DCTELEM *block);
+void ff_idct_sh4(DCTELEM *block);
 void ff_dsputil_init_align(DSPContext* c, AVCodecContext *avctx);
 
 #endif /* AVCODEC_SH4_DSPUTIL_SH4_H */
diff --git a/libavcodec/sh4/idct_sh4.c b/libavcodec/sh4/idct_sh4.c
index 0baff39..9da6ffc 100644
--- a/libavcodec/sh4/idct_sh4.c
+++ b/libavcodec/sh4/idct_sh4.c
@@ -89,7 +89,7 @@ static const float odd_table[] __attribute__ ((aligned(8))) = {
 
 //optimized
 
-void idct_sh4(DCTELEM *block)
+void ff_idct_sh4(DCTELEM *block)
 {
         DEFREG;
 



More information about the ffmpeg-cvslog mailing list