diff options
| author | Martin Storsjö <martin@martin.st> | 2012-02-15 12:26:15 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-02-15 22:06:42 +0200 |
| commit | 873c89e2a6825150edf036fd9993d53f25a0c6b8 (patch) | |
| tree | 7e161cabe27fbb42c1ff363ff1ffc831c7dc1e17 | |
| parent | 3e2efacdd8a3ffb5d1c9004f112492b946284f9b (diff) | |
| download | ffmpeg-873c89e2a6825150edf036fd9993d53f25a0c6b8.tar.gz | |
dsputil: Add ff_ prefix to inv_zigzag_direct16
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavcodec/dsputil.c | 4 | ||||
| -rw-r--r-- | libavcodec/x86/mpegvideo_mmx.c | 2 | ||||
| -rw-r--r-- | 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 3a84cce750..f9d933fe2f 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 7dd9a66783..7181a66914 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 0b6cff3540..13653c89b1 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") ); |