diff options
| author | Alex Converse <alex.converse@gmail.com> | 2009-05-13 21:57:58 +0400 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2009-05-13 21:57:58 +0400 |
| commit | 90350d73f8b6bb281d9028ad1adf4805a8bce717 (patch) | |
| tree | 5d578c80d73a85c29ff0eabb386aeed7b9bb53f0 /libavcodec/aac_ac3_parser.c | |
| parent | ee373ddffd2b2eb223804db5d7c35e692146f7cc (diff) | |
Allow parsing and decoding of ADTS AAC files with channel config = 0
Originally committed as revision 18815 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aac_ac3_parser.c')
| -rw-r--r-- | libavcodec/aac_ac3_parser.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index b51f1769f7..90cbb9535c 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -84,8 +84,10 @@ get_next: avctx->codec_id == CODEC_ID_EAC3)))) { avctx->channels = avctx->request_channels; } else { + if (avctx->codec_id != CODEC_ID_AAC || s->channels) { avctx->channels = s->channels; avctx->channel_layout = s->channel_layout; + } } avctx->bit_rate = s->bit_rate; avctx->frame_size = s->samples; |