From patchwork Fri Nov 25 00:18:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 1555 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp53545vsb; Thu, 24 Nov 2016 16:19:43 -0800 (PST) X-Received: by 10.28.134.146 with SMTP id i140mr4869587wmd.100.1480033183617; Thu, 24 Nov 2016 16:19:43 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h3si39527674wjk.144.2016.11.24.16.19.43; Thu, 24 Nov 2016 16:19:43 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D811B68982F; Fri, 25 Nov 2016 02:19:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8608B680C48 for ; Fri, 25 Nov 2016 02:19:29 +0200 (EET) Received: by mail-qk0-f194.google.com with SMTP id y205so4028027qkb.1 for ; Thu, 24 Nov 2016 16:19:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=cH4pIlPK/ZEJ6yETFHPeVu6dDN91uAznJAk3pMWbzsY=; b=FMXRScpqF8L/4L7gWGo8DUdwS5/9rbM5DiLnxGOr2LbHd0dv3rwetg79cPbBYgOV77 WAzEVSYe1tVbl9ExnJPdtDG3GUq1s1N7ZNrecOsjnJB1mfdELnMNUa5l6cKMondlgX/Z T7Epfap4tY9qiy1qhyMoKNItjNd/H9wT91Uwl8TOPLU5/YUXRqVcEuRgKV1PtztD6ZU1 bH5UOG6H89Wtq7VXtCLReqiuDhcr5qldEYgCIyxiMp9uyyTe7yCe2GIdCJVujc2Hqy04 o4eoAnMENuTnpiVVDbxnhrfO6VM2LDLvUhSUUTOmE8G5HJljcDtt1wuTlFV83kqUJBz5 j2YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=cH4pIlPK/ZEJ6yETFHPeVu6dDN91uAznJAk3pMWbzsY=; b=KGbDF+IVs0y9PYKirDXnfZ+YBdUxih9ZfaSwPVwOcYiBnJ/lqS36jL4PRRkExUASLn hR7nui1IDRli9WOoGUXeITtGylilOAaypcSzEmJtuXPnArX9b5jaV+H80yof3spAPLUV kL02DLX6xuAB0hNLy+2B10W/6ij/ZvaJD4hJLLWVuPSxkHBInLjGmWtMkANvHBT0FZj3 kLWFFDxE1XtM4aAwYXwgDDPGgS2RSX47iFg70mUQwYAZ4gfAk3KNRWWCs7++LG0flOYO REZz9E3sFy+qtthdlX6H9RecuPUDAOGSi7Fs5ASbNSZOOoSctr4+k2FvLbHIiTQDokS/ X1Ig== X-Gm-Message-State: AKaTC00rYGENkpeYvCYi3p5cdMPRnLnZUGfWYZmue4iRjDmV2vztwTbKXR/a+ocDP2e2rg== X-Received: by 10.55.177.5 with SMTP id a5mr4628789qkf.229.1480033172439; Thu, 24 Nov 2016 16:19:32 -0800 (PST) Received: from localhost.localdomain ([181.22.37.175]) by smtp.gmail.com with ESMTPSA id q128sm20127901qka.1.2016.11.24.16.19.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Nov 2016 16:19:32 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Nov 2016 21:18:33 -0300 Message-Id: <20161125001833.3560-1-jamrial@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH] avcodec/aac_adtstoasc: validate and forward extradata if the stream is already ASC X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes ticket #5973 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 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; }