diff options
| author | anonymous <> | 2005-01-26 12:01:35 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-01-26 12:01:35 +0000 |
| commit | 0c040aacbeef506793e619771f1f173107bde259 (patch) | |
| tree | 960cc2e3bd569364eb30ea64e145d0e94cce8de2 /libavcodec/msmpeg4.c | |
| parent | 53ffdd1434fbf0f5cc4d6c23d4907bd511863b15 (diff) | |
| download | ffmpeg-0c040aacbeef506793e619771f1f173107bde259.tar.gz | |
use dc tables from msmpeg4 instead of duplicating them patch by anonymous
Originally committed as revision 3886 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/msmpeg4.c')
| -rw-r--r-- | libavcodec/msmpeg4.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index e839b3fdb1..756f852082 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -882,15 +882,15 @@ static void msmpeg4_encode_dc(MpegEncContext * s, int level, int n, int *dir_ptr if (s->dc_table_index == 0) { if (n < 4) { - put_bits(&s->pb, table0_dc_lum[code][1], table0_dc_lum[code][0]); + put_bits(&s->pb, ff_table0_dc_lum[code][1], ff_table0_dc_lum[code][0]); } else { - put_bits(&s->pb, table0_dc_chroma[code][1], table0_dc_chroma[code][0]); + put_bits(&s->pb, ff_table0_dc_chroma[code][1], ff_table0_dc_chroma[code][0]); } } else { if (n < 4) { - put_bits(&s->pb, table1_dc_lum[code][1], table1_dc_lum[code][0]); + put_bits(&s->pb, ff_table1_dc_lum[code][1], ff_table1_dc_lum[code][0]); } else { - put_bits(&s->pb, table1_dc_chroma[code][1], table1_dc_chroma[code][0]); + put_bits(&s->pb, ff_table1_dc_chroma[code][1], ff_table1_dc_chroma[code][0]); } } @@ -1122,17 +1122,17 @@ int ff_msmpeg4_decode_init(MpegEncContext *s) } init_vlc(&dc_lum_vlc[0], DC_VLC_BITS, 120, - &table0_dc_lum[0][1], 8, 4, - &table0_dc_lum[0][0], 8, 4, 1); + &ff_table0_dc_lum[0][1], 8, 4, + &ff_table0_dc_lum[0][0], 8, 4, 1); init_vlc(&dc_chroma_vlc[0], DC_VLC_BITS, 120, - &table0_dc_chroma[0][1], 8, 4, - &table0_dc_chroma[0][0], 8, 4, 1); + &ff_table0_dc_chroma[0][1], 8, 4, + &ff_table0_dc_chroma[0][0], 8, 4, 1); init_vlc(&dc_lum_vlc[1], DC_VLC_BITS, 120, - &table1_dc_lum[0][1], 8, 4, - &table1_dc_lum[0][0], 8, 4, 1); + &ff_table1_dc_lum[0][1], 8, 4, + &ff_table1_dc_lum[0][0], 8, 4, 1); init_vlc(&dc_chroma_vlc[1], DC_VLC_BITS, 120, - &table1_dc_chroma[0][1], 8, 4, - &table1_dc_chroma[0][0], 8, 4, 1); + &ff_table1_dc_chroma[0][1], 8, 4, + &ff_table1_dc_chroma[0][0], 8, 4, 1); init_vlc(&v2_dc_lum_vlc, DC_VLC_BITS, 512, &v2_dc_lum_table[0][1], 8, 4, |