From 6e1902bab4349a79c45807af18ebf5b50f7b436b Mon Sep 17 00:00:00 2001 From: James Almer Date: Thu, 24 Nov 2016 21:10:47 -0300 Subject: [PATCH] avcodec/aac_adtstoasc_bsf: validate and forward extradata if the stream is already ASC Fixes ticket #5973 Reviewed-by: Hendrik Leppkes Signed-off-by: James Almer --- libavcodec/aac_adtstoasc_bsf.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libavcodec/aac_adtstoasc_bsf.c b/libavcodec/aac_adtstoasc_bsf.c index 48889fc48e..1067160559 100644 --- a/libavcodec/aac_adtstoasc_bsf.c +++ b/libavcodec/aac_adtstoasc_bsf.c @@ -136,8 +136,16 @@ fail: static int aac_adtstoasc_init(AVBSFContext *ctx) { - av_freep(&ctx->par_out->extradata); - ctx->par_out->extradata_size = 0; + /* Validate the extradata if the stream is already MPEG-4 AudioSpecificConfig */ + if (ctx->par_in->extradata) { + MPEG4AudioConfig mp4ac; + int ret = avpriv_mpeg4audio_get_config(&mp4ac, ctx->par_in->extradata, + ctx->par_in->extradata_size * 8, 1); + if (ret < 0) { + av_log(ctx, AV_LOG_ERROR, "Error parsing AudioSpecificConfig extradata!\n"); + return ret; + } + } return 0; }