aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-19 06:20:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-19 06:20:46 +0100
commit676a395ab903cac623c5d6ddd0928c789e08a59e (patch)
tree54d976a4e7ffbfc053ce1d65108a9eb91b6501fc
parent31e703e899bee74c50efd8eb62c3d012ef5ab26d (diff)
downloadffmpeg-676a395ab903cac623c5d6ddd0928c789e08a59e.tar.gz
avcodec/aacdec: Dont fail if channels arent known yet
Fixes Ticket3312 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/aacdec.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 365df2117d..27f4b4c660 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -196,6 +196,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;