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

[Michael Niedermayer]

ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 19 06:20:46 2014 +0100| [9d83cff1f117168899bdc97c32c8cb5244db7676] | 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)

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

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

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