RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '62de77ffcaebd42fe685b8426da56b89b2532318' 

* commit '62de77ffcaebd42fe685b8426da56b89b2532318':
  vorbis: Use a local codebook variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-08 18:56:07 +01:00
parent 8fabbd0dcf 62de77ffca
commit 10e3e3aa85
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/vorbisdec.c
View File

@ -1325,14 +1325,15 @@ static av_always_inline int setup_classifs(vorbis_context *vc,
int ptns_to_read int ptns_to_read
) )
{ {
vorbis_codebook *codebook = vc->codebooks + vr->classbook;
int p, j, i; int p, j, i;
unsigned c_p_c = vc->codebooks[vr->classbook].dimensions; unsigned c_p_c = codebook->dimensions;
unsigned inverse_class = ff_inverse[vr->classifications]; unsigned inverse_class = ff_inverse[vr->classifications];
unsigned temp, temp2; unsigned temp, temp2;
for (p = 0, j = 0; j < ch_used; ++j) { for (p = 0, j = 0; j < ch_used; ++j) {
if (!do_not_decode[j]) { if (!do_not_decode[j]) {
temp = get_vlc2(&vc->gb, vc->codebooks[vr->classbook].vlc.table, temp = get_vlc2(&vc->gb, codebook->vlc.table,
vc->codebooks[vr->classbook].nb_bits, 3); codebook->nb_bits, 3);
av_dlog(NULL, "Classword: %u\n", temp); av_dlog(NULL, "Classword: %u\n", temp);