[FFmpeg-cvslog] avcodec/aacdec: Dont fail if channels arent known yet
Michael Niedermayer
git at videolan.org
Sun Jan 19 15:00:16 CET 2014
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 19 06:20:46 2014 +0100| [6fa97413578ecf7165850f1259009d73bed45983] | 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=6fa97413578ecf7165850f1259009d73bed45983
---
libavcodec/aacdec.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 3379f8b..56f73ae 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) {
More information about the ffmpeg-cvslog
mailing list