diff options
| -rw-r--r-- | libavcodec/mpeg4data.h | 4 | ||||
| -rw-r--r-- | libavcodec/mpeg4video.h | 4 | ||||
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 8 | ||||
| -rw-r--r-- | libavcodec/mpeg4videoenc.c | 12 | ||||
| -rw-r--r-- | libavcodec/msmpeg4.c | 8 |
5 files changed, 18 insertions, 18 deletions
diff --git a/libavcodec/mpeg4data.h b/libavcodec/mpeg4data.h index 61797ee319..f67ba24cb4 100644 --- a/libavcodec/mpeg4data.h +++ b/libavcodec/mpeg4data.h @@ -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}, diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index ae7851ff93..f086954958 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -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]; diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index c0c565c7cb..2ccfd44ed6 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -2207,11 +2207,11 @@ static av_cold int decode_init(AVCodecContext *avctx) 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); diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 36dd3c90a2..f2a3e4bdcf 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -263,10 +263,10 @@ static inline void mpeg4_encode_dc(PutBitContext * s, int level, int n) 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 @@ static void init_uni_dc_tab(void) 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 @@ static void init_uni_dc_tab(void) 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; diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index e8d74da333..9687297620 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -98,8 +98,8 @@ static av_cold void init_h263_dc_for_msmpeg4(void) 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 @@ static av_cold void init_h263_dc_for_msmpeg4(void) 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) { |