diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-08 18:56:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-08 18:59:06 +0100 |
| commit | 10e3e3aa8510bdf97f2d296872b334c16009acb1 (patch) | |
| tree | bcb7e9f3dd33910c36809b6045e46be59aa60ca7 | |
| parent | 8fabbd0dcf3ac91bfced555fdf4819f500b6a88e (diff) | |
| parent | 62de77ffcaebd42fe685b8426da56b89b2532318 (diff) | |
| download | ffmpeg-10e3e3aa8510bdf97f2d296872b334c16009acb1.tar.gz | |
Merge commit '62de77ffcaebd42fe685b8426da56b89b2532318'
* commit '62de77ffcaebd42fe685b8426da56b89b2532318':
vorbis: Use a local codebook variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/vorbisdec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 0fce735d61..0c74d462be 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -1325,14 +1325,15 @@ static av_always_inline int setup_classifs(vorbis_context *vc, int ptns_to_read ) { + vorbis_codebook *codebook = vc->codebooks + vr->classbook; 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 temp, temp2; for (p = 0, j = 0; j < ch_used; ++j) { if (!do_not_decode[j]) { - temp = get_vlc2(&vc->gb, vc->codebooks[vr->classbook].vlc.table, - vc->codebooks[vr->classbook].nb_bits, 3); + temp = get_vlc2(&vc->gb, codebook->vlc.table, + codebook->nb_bits, 3); av_dlog(NULL, "Classword: %u\n", temp); |