[FFmpeg-cvslog] avcodec/aacdec: Dont fail if channels arent known yet

[Michael Niedermayer]

ffmpeg | branch: release/1.2 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 19 06:20:46 2014 +0100| [bd29764c6177f8bb07f70799a5de40df52cfde28] | committer: Carl Eugen Hoyos

avcodec/aacdec: Dont fail if channels arent known yet

Fixes Ticket3312

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 676a395ab903cac623c5d6ddd0928c789e08a59e)

Conflicts:
	libavcodec/aacdec.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd29764c6177f8bb07f70799a5de40df52cfde28
---

 libavcodec/aacdec.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 7a871c4..c9eb798 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -189,6 +189,9 @@ static int frame_configure_elements(AVCodecContext *avctx)
         }
     }
 
+    if (!avctx->channels)
+        return 1;
+
     /* get output buffer */
     ac->frame->nb_samples = 2048;
     if ((ret = ff_get_buffer(avctx, ac->frame)) < 0) {