[FFmpeg-cvslog] r16035 - in trunk/libavcodec: ac3.c ac3.h ac3dec.c
jbr
subversion
Mon Dec 8 04:15:10 CET 2008
Author: jbr
Date: Mon Dec 8 04:15:10 2008
New Revision: 16035
Log:
cosmetics: alignment after last commit
Modified:
trunk/libavcodec/ac3.c
trunk/libavcodec/ac3.h
trunk/libavcodec/ac3dec.c
Modified: trunk/libavcodec/ac3.c
==============================================================================
--- trunk/libavcodec/ac3.c (original)
+++ trunk/libavcodec/ac3.c Mon Dec 8 04:15:10 2008
@@ -81,10 +81,10 @@ void ff_ac3_bit_alloc_calc_psd(int8_t *e
}
int ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd,
- int start, int end, int fast_gain, int is_lfe,
- int dba_mode, int dba_nsegs, uint8_t *dba_offsets,
- uint8_t *dba_lengths, uint8_t *dba_values,
- int16_t *mask)
+ int start, int end, int fast_gain, int is_lfe,
+ int dba_mode, int dba_nsegs, uint8_t *dba_offsets,
+ uint8_t *dba_lengths, uint8_t *dba_values,
+ int16_t *mask)
{
int16_t excite[50]; /* excitation */
int bin, k;
Modified: trunk/libavcodec/ac3.h
==============================================================================
--- trunk/libavcodec/ac3.h (original)
+++ trunk/libavcodec/ac3.h Mon Dec 8 04:15:10 2008
@@ -152,10 +152,10 @@ void ff_ac3_bit_alloc_calc_psd(int8_t *e
* @return returns 0 for success, non-zero for error
*/
int ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd,
- int start, int end, int fast_gain, int is_lfe,
- int dba_mode, int dba_nsegs, uint8_t *dba_offsets,
- uint8_t *dba_lengths, uint8_t *dba_values,
- int16_t *mask);
+ int start, int end, int fast_gain, int is_lfe,
+ int dba_mode, int dba_nsegs, uint8_t *dba_offsets,
+ uint8_t *dba_lengths, uint8_t *dba_values,
+ int16_t *mask);
/**
* Calculates bit allocation pointers.
Modified: trunk/libavcodec/ac3dec.c
==============================================================================
--- trunk/libavcodec/ac3dec.c (original)
+++ trunk/libavcodec/ac3dec.c Mon Dec 8 04:15:10 2008
@@ -1134,11 +1134,11 @@ static int decode_audio_block(AC3DecodeC
/* Compute excitation function, Compute masking curve, and
Apply delta bit allocation */
if (ff_ac3_bit_alloc_calc_mask(&s->bit_alloc_params, s->band_psd[ch],
- s->start_freq[ch], s->end_freq[ch],
- s->fast_gain[ch], (ch == s->lfe_ch),
- s->dba_mode[ch], s->dba_nsegs[ch],
- s->dba_offsets[ch], s->dba_lengths[ch],
- s->dba_values[ch], s->mask[ch])) {
+ s->start_freq[ch], s->end_freq[ch],
+ s->fast_gain[ch], (ch == s->lfe_ch),
+ s->dba_mode[ch], s->dba_nsegs[ch],
+ s->dba_offsets[ch], s->dba_lengths[ch],
+ s->dba_values[ch], s->mask[ch])) {
av_log(s->avctx, AV_LOG_ERROR, "error in bit allocation\n");
return -1;
}
More information about the ffmpeg-cvslog
mailing list