[FFmpeg-cvslog] vorbisdec: Rename silly "class_" variable to plain "class".
Diego Biurrun
git at videolan.org
Thu Apr 28 04:28:31 CEST 2011
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Apr 27 16:38:35 2011 +0200| [b239526873dc81f9b66796ad4d9fe1cb93ec34d3] | committer: Diego Biurrun
vorbisdec: Rename silly "class_" variable to plain "class".
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b239526873dc81f9b66796ad4d9fe1cb93ec34d3
---
libavcodec/vorbisdec.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index d42507d..a9ddc7d 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -1136,7 +1136,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 class;
uint_fast8_t cdim;
uint_fast8_t cbits;
uint_fast8_t csub;
@@ -1160,20 +1160,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_];
+ class = vf->partition_class[i];
+ cdim = vf->class_dimensions[class];
+ cbits = vf->class_subclasses[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[class]].vlc.table,
+ vc->codebooks[vf->class_masterbook[class]].nb_bits, 3);
for (j = 0; j < cdim; ++j) {
- book = vf->subclass_books[class_][cval & csub];
+ book = vf->subclass_books[class][cval & csub];
AV_DEBUG("book %d Cbits %d cval %d bits:%d \n", book, cbits, cval, get_bits_count(gb));
More information about the ffmpeg-cvslog
mailing list