[FFmpeg-cvslog] avutil/mips/generic_macros_msa: rename macro variable which causes segfault for mips r6
Shivraj Patil
git at videolan.org
Thu Oct 6 00:44:47 EEST 2016
ffmpeg | branch: master | Shivraj Patil <shivraj.patil at imgtec.com> | Wed Oct 5 18:10:24 2016 +0530| [c1cc13cd2a9b8d6d2810ec42454f328a1a0d5efa] | committer: Michael Niedermayer
avutil/mips/generic_macros_msa: rename macro variable which causes segfault for mips r6
Signed-off-by: Shivraj Patil <shivraj.patil at imgtec.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c1cc13cd2a9b8d6d2810ec42454f328a1a0d5efa
---
libavutil/mips/generic_macros_msa.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavutil/mips/generic_macros_msa.h b/libavutil/mips/generic_macros_msa.h
index b1d18dd..0a59619 100644
--- a/libavutil/mips/generic_macros_msa.h
+++ b/libavutil/mips/generic_macros_msa.h
@@ -85,12 +85,12 @@
#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); \
@@ -172,12 +172,12 @@
#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); \
More information about the ffmpeg-cvslog
mailing list