summaryrefslogtreecommitdiff
path: root/libavcodec/ac3dec.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2008-08-31 03:08:18 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2008-08-31 03:08:18 +0000
commit1f6a594de4f415f97adb324c7b897ac1fa0078d1 (patch)
tree3757fe811a412e449a754077932aea94695ffd40 /libavcodec/ac3dec.c
parent6685f639afae35bd3b56305f3d0dff3078afecc7 (diff)
turn on E-AC-3 decoding support and update the Changelog
Originally committed as revision 15103 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ac3dec.c')
-rw-r--r--libavcodec/ac3dec.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index f51e2a8639..1432ff05a0 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -317,9 +317,8 @@ static int parse_frame_header(AC3DecodeContext *s)
memset(s->channel_uses_aht, 0, sizeof(s->channel_uses_aht));
return ac3_parse_header(s);
} else {
- /*s->eac3 = 1;
- return ff_eac3_parse_header(s);*/
- return AC3_PARSE_ERROR_BSID;
+ s->eac3 = 1;
+ return ff_eac3_parse_header(s);
}
}
@@ -557,10 +556,8 @@ 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)
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];
}