Mercurial > libavcodec.hg
changeset 4179:46d38e3d7038 libavcodec
rename squareTbl -> ff_squareTbl
| author | mru |
|---|---|
| date | Sun, 12 Nov 2006 21:48:04 +0000 |
| parents | f623a9939995 |
| children | 85e1f5ceb97e |
| files | dsputil.c dsputil.h mpegvideo.c snow.c |
| diffstat | 4 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/dsputil.c Sun Nov 12 20:23:47 2006 +0000 +++ b/dsputil.c Sun Nov 12 21:48:04 2006 +0000 @@ -41,7 +41,7 @@ void vorbis_inverse_coupling(float *mag, float *ang, int blocksize); uint8_t ff_cropTbl[256 + 2 * MAX_NEG_CROP] = {0, }; -uint32_t squareTbl[512] = {0, }; +uint32_t ff_squareTbl[512] = {0, }; const uint8_t ff_zigzag_direct[64] = { 0, 1, 8, 16, 9, 2, 3, 10, @@ -165,7 +165,7 @@ static int pix_norm1_c(uint8_t * pix, int line_size) { int s, i, j; - uint32_t *sq = squareTbl + 256; + uint32_t *sq = ff_squareTbl + 256; s = 0; for (i = 0; i < 16; i++) { @@ -231,7 +231,7 @@ static int sse4_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h) { int s, i; - uint32_t *sq = squareTbl + 256; + uint32_t *sq = ff_squareTbl + 256; s = 0; for (i = 0; i < h; i++) { @@ -248,7 +248,7 @@ static int sse8_c(void *v, uint8_t * pix1, uint8_t * pix2, int line_size, int h) { int s, i; - uint32_t *sq = squareTbl + 256; + uint32_t *sq = ff_squareTbl + 256; s = 0; for (i = 0; i < h; i++) { @@ -269,7 +269,7 @@ static int sse16_c(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h) { int s, i; - uint32_t *sq = squareTbl + 256; + uint32_t *sq = ff_squareTbl + 256; s = 0; for (i = 0; i < h; i++) { @@ -3872,7 +3872,7 @@ } for(i=0;i<512;i++) { - squareTbl[i] = (i - 256) * (i - 256); + ff_squareTbl[i] = (i - 256) * (i - 256); } for(i=0; i<64; i++) inv_zigzag_direct16[ff_zigzag_direct[i]]= i+1;
--- a/dsputil.h Sun Nov 12 20:23:47 2006 +0000 +++ b/dsputil.h Sun Nov 12 21:48:04 2006 +0000 @@ -74,7 +74,7 @@ #define MAX_NEG_CROP 1024 /* temporary */ -extern uint32_t squareTbl[512]; +extern uint32_t ff_squareTbl[512]; extern uint8_t ff_cropTbl[256 + 2 * MAX_NEG_CROP]; /* VP3 DSP functions */
--- a/mpegvideo.c Sun Nov 12 20:23:47 2006 +0000 +++ b/mpegvideo.c Sun Nov 12 21:48:04 2006 +0000 @@ -4751,7 +4751,7 @@ } static int sse(MpegEncContext *s, uint8_t *src1, uint8_t *src2, int w, int h, int stride){ - uint32_t *sq = squareTbl + 256; + uint32_t *sq = ff_squareTbl + 256; int acc=0; int x,y;