From 6fa97413578ecf7165850f1259009d73bed45983 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 19 Jan 2014 06:20:46 +0100 Subject: [PATCH] avcodec/aacdec: Dont fail if channels arent known yet Fixes Ticket3312 Signed-off-by: Michael Niedermayer (cherry picked from commit 676a395ab903cac623c5d6ddd0928c789e08a59e) Conflicts: libavcodec/aacdec.c --- libavcodec/aacdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 3379f8b701..56f73ae5d7 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -190,6 +190,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) {