# HG changeset patch # User lu_zero # Date 1223112995 0 # Node ID 2dfff0e25b47f214e2bf2badaf32d4d2a9f452c4 # Parent b5f5257c0c707d675a4317da9bb09b392896892c Mark ff_div6 and ff_rem6 static in h264.c. Patch by Diego Petten diff -r b5f5257c0c70 -r 2dfff0e25b47 h264.c --- a/h264.c Sat Oct 04 09:29:31 2008 +0000 +++ b/h264.c Sat Oct 04 09:36:35 2008 +0000 @@ -86,11 +86,11 @@ #endif } -const uint8_t ff_rem6[52]={ +static const uint8_t rem6[52]={ 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, }; -const uint8_t ff_div6[52]={ +static const uint8_t div6[52]={ 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8, }; @@ -2056,8 +2056,8 @@ } for(q=0; q<52; q++){ - int shift = ff_div6[q]; - int idx = ff_rem6[q]; + int shift = div6[q]; + int idx = rem6[q]; for(x=0; x<64; x++) h->dequant8_coeff[i][q][transpose ? (x>>3)|((x&7)<<3) : x] = ((uint32_t)dequant8_coeff_init[idx][ dequant8_coeff_init_scan[((x>>1)&12) | (x&3)] ] * @@ -2081,8 +2081,8 @@ continue; for(q=0; q<52; q++){ - int shift = ff_div6[q] + 2; - int idx = ff_rem6[q]; + int shift = div6[q] + 2; + int idx = rem6[q]; for(x=0; x<16; x++) h->dequant4_coeff[i][q][transpose ? (x>>2)|((x<<2)&0xF) : x] = ((uint32_t)dequant4_coeff_init[idx][(x&1) + ((x>>2)&1)] * diff -r b5f5257c0c70 -r 2dfff0e25b47 h264dspenc.c --- a/h264dspenc.c Sat Oct 04 09:29:31 2008 +0000 +++ b/h264dspenc.c Sat Oct 04 09:36:35 2008 +0000 @@ -28,9 +28,6 @@ #include "dsputil.h" -extern const uint8_t ff_div6[52]; -extern const uint8_t ff_rem6[52]; - #define H264_DCT_PART1(X) \ a = block[0][X]+block[3][X]; \ c = block[0][X]-block[3][X]; \