From 90350d73f8b6bb281d9028ad1adf4805a8bce717 Mon Sep 17 00:00:00 2001
From: Alex Converse <alex.converse@gmail.com>
Date: Wed, 13 May 2009 17:57:58 +0000
Subject: Allow parsing and decoding of ADTS AAC files with channel config = 0

Originally committed as revision 18815 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/aac_ac3_parser.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'libavcodec/aac_ac3_parser.c')

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;
-- 
cgit v1.2.3