diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-28 04:23:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-28 04:26:01 +0200 |
| commit | 0665199e438fcdd2000717352fc665a8cf017f7c (patch) | |
| tree | 41e6d53948b16b9b1c82900da0d28c61efab9333 /libavcodec/vorbisdec.c | |
| parent | e5d80c7b2d893422e2e60a97e08bfc48ca1684e6 (diff) | |
| parent | b239526873dc81f9b66796ad4d9fe1cb93ec34d3 (diff) | |
| download | ffmpeg-0665199e438fcdd2000717352fc665a8cf017f7c.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
vorbisdec: Rename silly "class_" variable to plain "class".
simple_idct_alpha: Drop some useless casts.
Simplify av_log_missing_feature().
ac3enc: remove check for mismatching channels and channel_layout
If AVCodecContext.channels is 0 and AVCodecContext.channel_layout is non-zero, set channels based on channel_layout.
If AVCodecContext.channel_layout and AVCodecContext.channels are both non-zero, check to make sure they do not contradict eachother.
cosmetics: indentation
Check AVCodec.supported_samplerates and AVCodec.channel_layouts in avcodec_open().
aacdec: remove sf_scale and sf_offset.
aacdec: use a scale of 2 in the LTP MDCT rather than doubling the coefficient table values from the spec.
Define POW_SF2_ZERO in aac.h and use for ff_aac_pow2sf_tabp[] offsets instead of hardcoding 200 everywhere.
Large intensity stereo and PNS indices are legal. Clip them instead of erroring out. A magnitude of 100 corresponds to 2^25 so the will most likely result in clipped output anyway.
qpeg: use reget_buffer() in decode_frame()
ultimotion: use reget_buffer() in ulti_decode_frame()
smacker: remove unnecessary call to avctx->release_buffer in decode_frame()
avparser: don't av_malloc(0).
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vorbisdec.c')
| -rw-r--r-- | libavcodec/vorbisdec.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index cad30a9ffa..47e01193fd 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 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_]; + 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)); |