RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avutil/mips/generic_macros_msa: rename macro variable which causes segfault for mips r6 

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c1cc13cd2a)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Shivraj Patil 2016-10-05 17:52:24 +05:30 committed by Michael Niedermayer
parent c2ea706282
commit d89979e86b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavutil/mips/generic_macros_msa.h
View File

@ -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); \