Mercurial > libavcodec.hg
changeset 10816:9abebeca7d1b libavcodec
Rename DCtab_*, its a global variable and it helps understanding if mpeg4
is in its name.
| author | michael |
|---|---|
| date | Fri, 08 Jan 2010 17:28:43 +0000 |
| parents | 2b0c54f9f9c2 |
| children | d1fe22d92a65 |
| files | mpeg4data.h mpeg4video.h mpeg4videodec.c mpeg4videoenc.c msmpeg4.c |
| diffstat | 5 files changed, 18 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/mpeg4data.h Fri Jan 08 16:37:32 2010 +0000 +++ b/mpeg4data.h Fri Jan 08 17:28:43 2010 +0000 @@ -32,13 +32,13 @@ #include "mpegvideo.h" /* dc encoding for mpeg4 */ -const uint8_t DCtab_lum[13][2] = +const uint8_t ff_mpeg4_DCtab_lum[13][2] = { {3,3}, {3,2}, {2,2}, {2,3}, {1,3}, {1,4}, {1,5}, {1,6}, {1,7}, {1,8}, {1,9}, {1,10}, {1,11}, }; -const uint8_t DCtab_chrom[13][2] = +const uint8_t ff_mpeg4_DCtab_chrom[13][2] = { {3,2}, {2,2}, {1,2}, {1,3}, {1,4}, {1,5}, {1,6}, {1,7}, {1,8}, {1,9}, {1,10}, {1,11}, {1,12},
--- a/mpeg4video.h Fri Jan 08 16:37:32 2010 +0000 +++ b/mpeg4video.h Fri Jan 08 17:28:43 2010 +0000 @@ -54,8 +54,8 @@ #define VOP_STARTCODE 0x1B6 /* dc encoding for mpeg4 */ -extern const uint8_t DCtab_lum[13][2]; -extern const uint8_t DCtab_chrom[13][2]; +extern const uint8_t ff_mpeg4_DCtab_lum[13][2]; +extern const uint8_t ff_mpeg4_DCtab_chrom[13][2]; extern const uint16_t intra_vlc[103][2]; extern const int8_t intra_level[102];
--- a/mpeg4videodec.c Fri Jan 08 16:37:32 2010 +0000 +++ b/mpeg4videodec.c Fri Jan 08 17:28:43 2010 +0000 @@ -2207,11 +2207,11 @@ INIT_VLC_RL(rvlc_rl_inter, 1072); INIT_VLC_RL(rvlc_rl_intra, 1072); INIT_VLC_STATIC(&dc_lum, DC_VLC_BITS, 10 /* 13 */, - &DCtab_lum[0][1], 2, 1, - &DCtab_lum[0][0], 2, 1, 512); + &ff_mpeg4_DCtab_lum[0][1], 2, 1, + &ff_mpeg4_DCtab_lum[0][0], 2, 1, 512); INIT_VLC_STATIC(&dc_chrom, DC_VLC_BITS, 10 /* 13 */, - &DCtab_chrom[0][1], 2, 1, - &DCtab_chrom[0][0], 2, 1, 512); + &ff_mpeg4_DCtab_chrom[0][1], 2, 1, + &ff_mpeg4_DCtab_chrom[0][0], 2, 1, 512); INIT_VLC_STATIC(&sprite_trajectory, SPRITE_TRAJ_VLC_BITS, 15, &sprite_trajectory_tab[0][1], 4, 2, &sprite_trajectory_tab[0][0], 4, 2, 128);
--- a/mpeg4videoenc.c Fri Jan 08 16:37:32 2010 +0000 +++ b/mpeg4videoenc.c Fri Jan 08 17:28:43 2010 +0000 @@ -263,10 +263,10 @@ if (n < 4) { /* luminance */ - put_bits(&s->pb, DCtab_lum[size][1], DCtab_lum[size][0]); + put_bits(&s->pb, ff_mpeg4_DCtab_lum[size][1], ff_mpeg4_DCtab_lum[size][0]); } else { /* chrominance */ - put_bits(&s->pb, DCtab_chrom[size][1], DCtab_chrom[size][0]); + put_bits(&s->pb, ff_mpeg4_DCtab_chrom[size][1], ff_mpeg4_DCtab_chrom[size][0]); } /* encode remaining bits */ @@ -1125,8 +1125,8 @@ l= level; /* luminance */ - uni_code= DCtab_lum[size][0]; - uni_len = DCtab_lum[size][1]; + uni_code= ff_mpeg4_DCtab_lum[size][0]; + uni_len = ff_mpeg4_DCtab_lum[size][1]; if (size > 0) { uni_code<<=size; uni_code|=l; @@ -1140,8 +1140,8 @@ uni_DCtab_lum_len [level+256]= uni_len; /* chrominance */ - uni_code= DCtab_chrom[size][0]; - uni_len = DCtab_chrom[size][1]; + uni_code= ff_mpeg4_DCtab_chrom[size][0]; + uni_len = ff_mpeg4_DCtab_chrom[size][1]; if (size > 0) { uni_code<<=size; uni_code|=l;
--- a/msmpeg4.c Fri Jan 08 16:37:32 2010 +0000 +++ b/msmpeg4.c Fri Jan 08 17:28:43 2010 +0000 @@ -98,8 +98,8 @@ l= level; /* luminance h263 */ - uni_code= DCtab_lum[size][0]; - uni_len = DCtab_lum[size][1]; + uni_code= ff_mpeg4_DCtab_lum[size][0]; + uni_len = ff_mpeg4_DCtab_lum[size][1]; uni_code ^= (1<<uni_len)-1; //M$ does not like compatibility if (size > 0) { @@ -114,8 +114,8 @@ v2_dc_lum_table[level+256][1]= uni_len; /* chrominance h263 */ - uni_code= DCtab_chrom[size][0]; - uni_len = DCtab_chrom[size][1]; + uni_code= ff_mpeg4_DCtab_chrom[size][0]; + uni_len = ff_mpeg4_DCtab_chrom[size][1]; uni_code ^= (1<<uni_len)-1; //M$ does not like compatibility if (size > 0) {