har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

h261: Move mvmap table to the only place it is used

Browse Source
This commit is contained in:
Diego Biurrun 2013-04-04 14:34:38 +02:00
parent 0404ec619d
commit 52cd84d4d4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h261data.h
View File

@ -92,10 +92,6 @@ static const uint8_t h261_mv_tab[17][2] = {
{ 11, 9 }, { 10, 9 }, { 9, 9 }, { 17, 10 }, { 16, 10 }, { 15, 10 }, { 14, 10 }, { 13, 10 }, { 12, 10 } { 11, 9 }, { 10, 9 }, { 9, 9 }, { 17, 10 }, { 16, 10 }, { 15, 10 }, { 14, 10 }, { 13, 10 }, { 12, 10 }
}; };
static const int mvmap[17] = {
0, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -14, -15, -16
};
// H.261 VLC table for coded block pattern // H.261 VLC table for coded block pattern
static const uint8_t h261_cbp_tab[63][2] = { static const uint8_t h261_cbp_tab[63][2] = {
{ 11, 5 }, { 9, 5 }, { 13, 6 }, { 13, 4 }, { 23, 7 }, { 19, 7 }, { 31, 8 }, { 12, 4 }, { 11, 5 }, { 9, 5 }, { 13, 6 }, { 13, 4 }, { 23, 7 }, { 19, 7 }, { 31, 8 }, { 12, 4 },

4
libavcodec/h261dec.c
View File

@ -222,6 +222,10 @@ static int h261_decode_mb_skipped(H261Context *h, int mba1, int mba2)
return 0; return 0;
} }
static const int mvmap[17] = {
0, -1, -2, -3, -4, -5, -6, -7, -8, -9, -10, -11, -12, -13, -14, -15, -16
};
static int decode_mv_component(GetBitContext *gb, int v) static int decode_mv_component(GetBitContext *gb, int v)
{ {
int mv_diff = get_vlc2(gb, h261_mv_vlc.table, H261_MV_VLC_BITS, 2); int mv_diff = get_vlc2(gb, h261_mv_vlc.table, H261_MV_VLC_BITS, 2);