OSDN Git Service

avutil/mips/generic_macros_msa: rename macro variable which causes segfault for mips r6
authorShivraj Patil <shivraj.patil@imgtec.com>
Wed, 5 Oct 2016 12:22:24 +0000 (17:52 +0530)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 5 Oct 2016 21:44:03 +0000 (23:44 +0200)
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavutil/mips/generic_macros_msa.h

index b1d18dd..0a59619 100644 (file)
     #else  // !(__mips == 64)
         #define LD(psrc)                                              \
         ( {                                                           \
-            uint8_t *psrc_m = (uint8_t *) (psrc);                     \
+            uint8_t *psrc_ld_m = (uint8_t *) (psrc);                  \
             uint32_t val0_m, val1_m;                                  \
             uint64_t val_m = 0;                                       \
                                                                       \
-            val0_m = LW(psrc_m);                                      \
-            val1_m = LW(psrc_m + 4);                                  \
+            val0_m = LW(psrc_ld_m);                                   \
+            val1_m = LW(psrc_ld_m + 4);                               \
                                                                       \
             val_m = (uint64_t) (val1_m);                              \
             val_m = (uint64_t) ((val_m << 32) & 0xFFFFFFFF00000000);  \
     #else  // !(__mips == 64)
         #define LD(psrc)                                              \
         ( {                                                           \
-            uint8_t *psrc_m1 = (uint8_t *) (psrc);                    \
+            uint8_t *psrc_ld_m = (uint8_t *) (psrc);                  \
             uint32_t val0_m, val1_m;                                  \
             uint64_t val_m = 0;                                       \
                                                                       \
-            val0_m = LW(psrc_m1);                                     \
-            val1_m = LW(psrc_m1 + 4);                                 \
+            val0_m = LW(psrc_ld_m);                                   \
+            val1_m = LW(psrc_ld_m + 4);                               \
                                                                       \
             val_m = (uint64_t) (val1_m);                              \
             val_m = (uint64_t) ((val_m << 32) & 0xFFFFFFFF00000000);  \