aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-04-28 11:20:08 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-04-28 11:23:22 +0200
commitb35a846923e554e49c593e26f746016558107a59 (patch)
treeb1332e521e793d8d5207359effaacf2055446b52
parent2d8d6882a7316a49818778a953648b3770e8f604 (diff)
downloadffmpeg-b35a846923e554e49c593e26f746016558107a59.tar.gz
Change silly variable name "class" to "partition_class".
-rw-r--r--libavcodec/vorbisdec.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index 47e01193fd..a7f83ebf41 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -1138,7 +1138,7 @@ static int vorbis_floor1_decode(vorbis_context *vc,
uint_fast16_t floor1_Y[258];
uint_fast16_t floor1_Y_final[258];
int floor1_flag[258];
- uint_fast8_t class;
+ uint_fast8_t partition_class;
uint_fast8_t cdim;
uint_fast8_t cbits;
uint_fast8_t csub;
@@ -1162,20 +1162,20 @@ static int vorbis_floor1_decode(vorbis_context *vc,
offset = 2;
for (i = 0; i < vf->partitions; ++i) {
- class = vf->partition_class[i];
- cdim = vf->class_dimensions[class];
- cbits = vf->class_subclasses[class];
+ partition_class = vf->partition_class[i];
+ cdim = vf->class_dimensions[partition_class];
+ cbits = vf->class_subclasses[partition_class];
csub = (1 << cbits) - 1;
cval = 0;
AV_DEBUG("Cbits %d \n", cbits);
if (cbits) // this reads all subclasses for this partition's class
- cval = get_vlc2(gb, vc->codebooks[vf->class_masterbook[class]].vlc.table,
- vc->codebooks[vf->class_masterbook[class]].nb_bits, 3);
+ cval = get_vlc2(gb, vc->codebooks[vf->class_masterbook[partition_class]].vlc.table,
+ vc->codebooks[vf->class_masterbook[partition_class]].nb_bits, 3);
for (j = 0; j < cdim; ++j) {
- book = vf->subclass_books[class][cval & csub];
+ book = vf->subclass_books[partition_class][cval & csub];
AV_DEBUG("book %d Cbits %d cval %d bits:%d \n", book, cbits, cval, get_bits_count(gb));