diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-04-04 14:56:01 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-04-10 13:32:04 +0200 |
| commit | 8a776ad90e00ab2b98e8683ac6182d641a383c3a (patch) | |
| tree | 4671a446d30fcc2dbd313b66cc928bdb4134be5f /libavcodec/h261dec.c | |
| parent | b93b27edb0455287f49182fbf11b68e575f59225 (diff) | |
h261: Move shared data tables from a header to a proper C file
Diffstat (limited to 'libavcodec/h261dec.c')
| -rw-r--r-- | libavcodec/h261dec.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index b13d779a65..699f7cf8ef 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -29,7 +29,6 @@ #include "mpegvideo.h" #include "h263.h" #include "h261.h" -#include "h261data.h" #define H261_MBA_VLC_BITS 9 #define H261_MTYPE_VLC_BITS 6 @@ -51,19 +50,19 @@ static av_cold void h261_decode_init_vlc(H261Context *h) if (!done) { done = 1; INIT_VLC_STATIC(&h261_mba_vlc, H261_MBA_VLC_BITS, 35, - h261_mba_bits, 1, 1, - h261_mba_code, 1, 1, 662); + ff_h261_mba_bits, 1, 1, + ff_h261_mba_code, 1, 1, 662); INIT_VLC_STATIC(&h261_mtype_vlc, H261_MTYPE_VLC_BITS, 10, - h261_mtype_bits, 1, 1, - h261_mtype_code, 1, 1, 80); + ff_h261_mtype_bits, 1, 1, + ff_h261_mtype_code, 1, 1, 80); INIT_VLC_STATIC(&h261_mv_vlc, H261_MV_VLC_BITS, 17, - &h261_mv_tab[0][1], 2, 1, - &h261_mv_tab[0][0], 2, 1, 144); + &ff_h261_mv_tab[0][1], 2, 1, + &ff_h261_mv_tab[0][0], 2, 1, 144); INIT_VLC_STATIC(&h261_cbp_vlc, H261_CBP_VLC_BITS, 63, - &h261_cbp_tab[0][1], 2, 1, - &h261_cbp_tab[0][0], 2, 1, 512); - ff_init_rl(&h261_rl_tcoeff, ff_h261_rl_table_store); - INIT_VLC_RL(h261_rl_tcoeff, 552); + &ff_h261_cbp_tab[0][1], 2, 1, + &ff_h261_cbp_tab[0][0], 2, 1, 512); + ff_init_rl(&ff_h261_rl_tcoeff, ff_h261_rl_table_store); + INIT_VLC_RL(ff_h261_rl_tcoeff, 552); } } @@ -256,7 +255,7 @@ static int h261_decode_block(H261Context *h, int16_t *block, int n, int coded) { MpegEncContext *const s = &h->s; int code, level, i, j, run; - RLTable *rl = &h261_rl_tcoeff; + RLTable *rl = &ff_h261_rl_tcoeff; const uint8_t *scan_table; /* For the variable length encoding there are two code tables, one being @@ -377,7 +376,7 @@ static int h261_decode_mb(H261Context *h) // Read mtype h->mtype = get_vlc2(&s->gb, h261_mtype_vlc.table, H261_MTYPE_VLC_BITS, 2); - h->mtype = h261_mtype_map[h->mtype]; + h->mtype = ff_h261_mtype_map[h->mtype]; // Read mquant if (IS_QUANT(h->mtype)) |