Mercurial > libavcodec.hg
comparison mpegaudiodec.c @ 3023:80fc42ba85b7 libavcodec
get_vlc -> get_vlc2 transition.
| author | banan |
|---|---|
| date | Sun, 08 Jan 2006 19:31:21 +0000 |
| parents | bfabfdf9ce55 |
| children | 0b546eab515d |
comparison
equal
deleted
inserted
replaced
| 3022:d4080a510724 | 3023:80fc42ba85b7 |
|---|---|
| 1648 /* read huffcode and compute each couple */ | 1648 /* read huffcode and compute each couple */ |
| 1649 for(;j>0;j--) { | 1649 for(;j>0;j--) { |
| 1650 if (get_bits_count(&s->gb) >= end_pos) | 1650 if (get_bits_count(&s->gb) >= end_pos) |
| 1651 break; | 1651 break; |
| 1652 if (code_table) { | 1652 if (code_table) { |
| 1653 code = get_vlc(&s->gb, vlc); | 1653 code = get_vlc2(&s->gb, vlc->table, 8, 2); |
| 1654 if (code < 0) | 1654 if (code < 0) |
| 1655 return -1; | 1655 return -1; |
| 1656 y = code_table[code]; | 1656 y = code_table[code]; |
| 1657 x = y >> 4; | 1657 x = y >> 4; |
| 1658 y = y & 0x0f; | 1658 y = y & 0x0f; |
| 1699 } | 1699 } |
| 1700 break; | 1700 break; |
| 1701 } | 1701 } |
| 1702 last_gb= s->gb; | 1702 last_gb= s->gb; |
| 1703 | 1703 |
| 1704 code = get_vlc(&s->gb, vlc); | 1704 code = get_vlc2(&s->gb, vlc->table, vlc->bits, 2); |
| 1705 dprintf("t=%d code=%d\n", g->count1table_select, code); | 1705 dprintf("t=%d code=%d\n", g->count1table_select, code); |
| 1706 if (code < 0) | 1706 if (code < 0) |
| 1707 return -1; | 1707 return -1; |
| 1708 for(i=0;i<4;i++) { | 1708 for(i=0;i<4;i++) { |
| 1709 if (code & (8 >> i)) { | 1709 if (code & (8 >> i)) { |