diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-26 15:29:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-26 15:41:27 +0100 |
| commit | 71258e5d87cb4f5c7a1766f847c140cf15983ef9 (patch) | |
| tree | 73cb3e66ecec7bb9ff80676312c0fbd567ed3e58 | |
| parent | 2139e584391b6db7ad315cf4f6443f87f7813d51 (diff) | |
| download | ffmpeg-71258e5d87cb4f5c7a1766f847c140cf15983ef9.tar.gz | |
avcodec/ac3dec: Put CONFIG* first in if()
This may fix build failures with EAC3 disabled and is more consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/ac3dec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index e3bf2922eb..234b469bc0 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -601,7 +601,7 @@ static void decode_transform_coeffs_ch(AC3DecodeContext *s, int blk, int ch, /* if AHT is used, mantissas for all blocks are encoded in the first block of the frame. */ int bin; - if (!blk && CONFIG_EAC3_DECODER) + if (CONFIG_EAC3_DECODER && !blk) ff_eac3_decode_transform_coeffs_aht_ch(s, ch); for (bin = s->start_freq[ch]; bin < s->end_freq[ch]; bin++) { s->fixed_coeffs[ch][bin] = s->pre_mantissa[ch][bin][blk] >> s->dexps[ch][bin]; @@ -1352,7 +1352,7 @@ static int decode_audio_block(AC3DecodeContext *s, int blk) } /* apply spectral extension to high frequency bins */ - if (s->spx_in_use && CONFIG_EAC3_DECODER) { + if (CONFIG_EAC3_DECODER && s->spx_in_use) { ff_eac3_apply_spectral_extension(s); } |