On 11/24/2016 9:18 PM, James Almer wrote:
> Fixes ticket #5973
>
> Signed-off-by: James Almer <jamr...@gmail.com>
> ---
> 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 48889fc..1067160 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;
> }
Approved by Hendrik on IRC, pushed and backported to release/3.2
Thanks.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
