diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-19 06:20:46 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-01-19 14:58:22 +0100 |
| commit | 6fa97413578ecf7165850f1259009d73bed45983 (patch) | |
| tree | d6a2074d7b6dc8443c18fc89b964cde0ff4d5553 | |
| parent | bb26a88193d93d3f9bee65064a92fcac1da7f657 (diff) | |
| download | ffmpeg-6fa97413578ecf7165850f1259009d73bed45983.tar.gz | |
avcodec/aacdec: Dont fail if channels arent known yet
Fixes Ticket3312
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 676a395ab903cac623c5d6ddd0928c789e08a59e)
Conflicts:
libavcodec/aacdec.c
| -rw-r--r-- | libavcodec/aacdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
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) { |