---
libavcodec/dsputil.c | 4 ++--
libavcodec/x86/mpegvideo_mmx.c | 2 +-
libavcodec/x86/mpegvideo_mmx_template.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 3a84cce..f9d933f 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -82,7 +82,7 @@ const uint8_t ff_zigzag248_direct[64] = {
};
/* not permutated inverse zigzag_direct + 1 for MMX quantizer */
-DECLARE_ALIGNED(16, uint16_t, inv_zigzag_direct16)[64];
+DECLARE_ALIGNED(16, uint16_t, ff_inv_zigzag_direct16)[64];
const uint8_t ff_alternate_horizontal_scan[64] = {
0, 1, 2, 3, 8, 9, 16, 17,
@@ -2761,7 +2761,7 @@ av_cold void ff_dsputil_static_init(void)
ff_squareTbl[i] = (i - 256) * (i - 256);
}
- for(i=0; i<64; i++) inv_zigzag_direct16[ff_zigzag_direct[i]]= i+1;
+ for(i=0; i<64; i++) ff_inv_zigzag_direct16[ff_zigzag_direct[i]]= i+1;
}
int ff_check_alignment(void){
diff --git a/libavcodec/x86/mpegvideo_mmx.c b/libavcodec/x86/mpegvideo_mmx.c
index 7dd9a66..7181a66 100644
--- a/libavcodec/x86/mpegvideo_mmx.c
+++ b/libavcodec/x86/mpegvideo_mmx.c
@@ -29,7 +29,7 @@
#include "libavcodec/mpegvideo.h"
#include "dsputil_mmx.h"
-extern uint16_t inv_zigzag_direct16[64];
+extern uint16_t ff_inv_zigzag_direct16[64];
static void dct_unquantize_h263_intra_mmx(MpegEncContext *s,
diff --git a/libavcodec/x86/mpegvideo_mmx_template.c
b/libavcodec/x86/mpegvideo_mmx_template.c
index 0b6cff3..13653c8 100644
--- a/libavcodec/x86/mpegvideo_mmx_template.c
+++ b/libavcodec/x86/mpegvideo_mmx_template.c
@@ -168,7 +168,7 @@ static int RENAME(dct_quantize)(MpegEncContext *s,
"movzb %%al, %%"REG_a" \n\t" // last_non_zero_p1
: "+a" (last_non_zero_p1)
: "r" (block+64), "r" (qmat), "r" (bias),
- "r" (inv_zigzag_direct16+64), "r" (temp_block+64)
+ "r" (ff_inv_zigzag_direct16+64), "r" (temp_block+64)
XMM_CLOBBERS_ONLY("%xmm0", "%xmm1", "%xmm2", "%xmm3",
"%xmm4", "%xmm5", "%xmm6", "%xmm7")
);
@@ -202,7 +202,7 @@ static int RENAME(dct_quantize)(MpegEncContext *s,
"movzb %%al, %%"REG_a" \n\t" // last_non_zero_p1
: "+a" (last_non_zero_p1)
: "r" (block+64), "r" (qmat+64), "r" (bias+64),
- "r" (inv_zigzag_direct16+64), "r" (temp_block+64)
+ "r" (ff_inv_zigzag_direct16+64), "r" (temp_block+64)
XMM_CLOBBERS_ONLY("%xmm0", "%xmm1", "%xmm2", "%xmm3",
"%xmm4", "%xmm5", "%xmm6", "%xmm7")
);
--
1.7.3.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
