[FFmpeg-cvslog] r11101 - in trunk/libavcodec/i386: dsputil_mmx.c dsputil_mmx.h h264dsp_mmx.c

[aurel]

Author: aurel
Date: Tue Nov 27 23:36:15 2007
New Revision: 11101

Log:
use ff_ prefix for extern vars

Modified:
   trunk/libavcodec/i386/dsputil_mmx.c
   trunk/libavcodec/i386/dsputil_mmx.h
   trunk/libavcodec/i386/h264dsp_mmx.c

Modified: trunk/libavcodec/i386/dsputil_mmx.c
==============================================================================
--- trunk/libavcodec/i386/dsputil_mmx.c	(original)
+++ trunk/libavcodec/i386/dsputil_mmx.c	Tue Nov 27 23:36:15 2007
@@ -41,10 +41,10 @@ extern void ff_idct_xvid_mmx2(short *blo
 int mm_flags; /* multimedia extension flags */
 
 /* pixel operations */
-DECLARE_ALIGNED_8 (const uint64_t, mm_bone) = 0x0101010101010101ULL;
-DECLARE_ALIGNED_8 (const uint64_t, mm_wone) = 0x0001000100010001ULL;
-DECLARE_ALIGNED_8 (const uint64_t, mm_wtwo) = 0x0002000200020002ULL;
-DECLARE_ALIGNED_8 (const uint64_t, mm_wabs) = 0xFFFFFFFFFFFFFFFFULL;
+DECLARE_ALIGNED_8 (const uint64_t, ff_bone) = 0x0101010101010101ULL;
+DECLARE_ALIGNED_8 (const uint64_t, ff_wone) = 0x0001000100010001ULL;
+DECLARE_ALIGNED_8 (const uint64_t, ff_wtwo) = 0x0002000200020002ULL;
+DECLARE_ALIGNED_8 (const uint64_t, ff_wabs) = 0xFFFFFFFFFFFFFFFFULL;
 
 DECLARE_ALIGNED_16(const uint64_t, ff_pdw_80000000[2]) =
 {0x8000000080000000ULL, 0x8000000080000000ULL};
@@ -87,8 +87,8 @@ DECLARE_ALIGNED_16(const double, ff_pd_2
     "paddb %%" #regd ", %%" #regd " \n\t" ::)
 
 #ifndef PIC
-#define MOVQ_BONE(regd)  __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_bone))
-#define MOVQ_WTWO(regd)  __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_wtwo))
+#define MOVQ_BONE(regd)  __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(ff_bone))
+#define MOVQ_WTWO(regd)  __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(ff_wtwo))
 #else
 // for shared library it's better to use this way for accessing constants
 // pcmpeqd -> -1

Modified: trunk/libavcodec/i386/dsputil_mmx.h
==============================================================================
--- trunk/libavcodec/i386/dsputil_mmx.h	(original)
+++ trunk/libavcodec/i386/dsputil_mmx.h	Tue Nov 27 23:36:15 2007
@@ -22,10 +22,10 @@
 #ifndef FFMPEG_DSPUTIL_MMX_H
 #define FFMPEG_DSPUTIL_MMX_H
 
-extern const uint64_t mm_bone;
-extern const uint64_t mm_wone;
-extern const uint64_t mm_wtwo;
-extern const uint64_t mm_wabs;
+extern const uint64_t ff_bone;
+extern const uint64_t ff_wone;
+extern const uint64_t ff_wtwo;
+extern const uint64_t ff_wabs;
 
 extern const uint64_t ff_pdw_80000000[2];
 

Modified: trunk/libavcodec/i386/h264dsp_mmx.c
==============================================================================
--- trunk/libavcodec/i386/h264dsp_mmx.c	(original)
+++ trunk/libavcodec/i386/h264dsp_mmx.c	Tue Nov 27 23:36:15 2007
@@ -364,7 +364,7 @@ static void ff_h264_idct8_dc_add_mmx2(ui
         "paddusb %%mm3              , %%mm1 \n\t"\
         "paddusb %%mm6              , %%mm2 \n\t"
 
-// in: mm0=p1 mm1=p0 mm2=q0 mm3=q1 mm7=(tc&mask) %8=mm_bone
+// in: mm0=p1 mm1=p0 mm2=q0 mm3=q1 mm7=(tc&mask) %8=ff_bone
 // out: (q1addr) = av_clip( (q2+((p0+q0+1)>>1))>>1, q1-tc0, q1+tc0 )
 // clobbers: q2, tmp, tc0
 #define H264_DEBLOCK_Q1(p1, q2, q2addr, q1addr, tc0, tmp)\
@@ -430,7 +430,7 @@ static inline void h264_loop_filter_luma
         : "=m"(*tmp0)
         : "r"(pix-3*stride), "r"(pix), "r"((long)stride),
           "m"(*tmp0/*unused*/), "m"(*(uint32_t*)tc0), "m"(alpha1), "m"(beta1),
-          "m"(mm_bone)
+          "m"(ff_bone)
     );
 }
 
@@ -477,7 +477,7 @@ static inline void h264_loop_filter_chro
 
         :: "r"(pix-2*stride), "r"(pix), "r"((long)stride),
            "r"(*(uint32_t*)tc0),
-           "m"(alpha1), "m"(beta1), "m"(mm_bone), "m"(ff_pb_3F)
+           "m"(alpha1), "m"(beta1), "m"(ff_bone), "m"(ff_pb_3F)
     );
 }
 
@@ -527,7 +527,7 @@ static inline void h264_loop_filter_chro
         "movq    %%mm1,   (%0,%2)   \n\t"
         "movq    %%mm2,   (%1)      \n\t"
         :: "r"(pix-2*stride), "r"(pix), "r"((long)stride),
-           "m"(alpha1), "m"(beta1), "m"(mm_bone)
+           "m"(alpha1), "m"(beta1), "m"(ff_bone)
     );
 }