From patchwork Sun Jan 14 12:06:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 7282 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp1692273jaa; Sun, 14 Jan 2018 04:14:37 -0800 (PST) X-Google-Smtp-Source: ACJfBouLeGIwoLCWByz6rbqK8uV4Za343+6UUxUve1r3cvm/PaKpv4/EkB3sKJyxRXEJyXLUloh2 X-Received: by 10.223.180.82 with SMTP id v18mr15451305wrd.179.1515932077694; Sun, 14 Jan 2018 04:14:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515932077; cv=none; d=google.com; s=arc-20160816; b=fc58+GbfwyNs31IB3fTrK1tbuuvZo6+IBS9KcM4vrCullFOZooo04oQvq/jRlWz2dW mpCMgOFHflJX5IQdzpfEw4tbuvMUumAwmQVWt8KCGv541m+PNU3jiRjnFMcdkOCJSw7V FBHxI8A+S6vsdatbFgxAVRXn2HIgEYb6hAZ7A05AUPMHnaZY9m6GQLk4vIIAjeK6vJ13 J5+uZiErC14kCPKIoOAnilorNhmkxnSJwkOGdP0GHtMU6pcXBz73ZcBftazUdfUIJNHA Jr8yWO4hX4s3cQAl6ssnJTpYlPyEdkVagSsf6l1p4M4smkX3bi3bn1b00BJj6yadVR2n nUMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-disposition:content-language :mime-version:user-agent:date:message-id:from:to:dkim-signature :delivered-to:arc-authentication-results; bh=Hd499fD2QW25y26AnHI7nJMyNju5cBaTJU1UsyKA9Xw=; b=nBWRAGI/tmIAbSIXGfKhLOpw7oOnYZVfhIhcZMZdBibO/foDgKyxxgUNli/0O6brgr S6tqWX5s/1bOmpVUC7cBcl5L2gXgKWscAhOjTHwtERUCKqNKLwMYeICP4D5RXAQc8JMW 8goBgIEjPwXezwTWZv6mXrdzEJvOlZfA6VQ5ZraNcpKp6JSVyJS5p771CGhikaae5KDE 5xXKYXnoL+SILRITmmE7euMZsAPf+6PH799eO4ksSCV1ch2rjTuALaK1uahqdB8vkmLR I05z4+CnRzAD/YizFlhyaBGTfLsSb7qVUit2ypCoydd9TVcV5oOdJ+Mu+i2060glF8fw mPJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=N/RbPid0; 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 sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f71si733077wmh.275.2018.01.14.04.14.36; Sun, 14 Jan 2018 04:14:37 -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 header.s=20161025 header.b=N/RbPid0; 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 sp=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 CA2E7689E59; Sun, 14 Jan 2018 14:14:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE5CC689C65 for ; Sun, 14 Jan 2018 14:14:26 +0200 (EET) Received: by mail-pg0-f68.google.com with SMTP id d6so6834443pgv.2 for ; Sun, 14 Jan 2018 04:14:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=qz4FXzgqWUyDC0WXfzbwXReRU3pBHX9KhAHtwyPe0w8=; b=N/RbPid0mNkyxKNvzty7I7iGY3hQC0XwoUjWrSH8epnLRTiBhaev7QNPRLzydl/TaA IXiJ0U01fkr7Fshmy5lJ46yRA8SXomMOWxB10bEh9nvDv8JwJZTeD0amUfbOVaXCnWg1 q9mzMmaFuZOANhWrQ1XBeO7JcsISFOgQEnefRVqMOknrIkOO0yrp71VeWHyYXhr2enDG nY6+OP/z7F5GgREEmm/wKgtTydePuz0aL9jHcTv/acjB4mlmrPeRuweF6nGPtM5k/a+q HNgLubj1lE1fizHbZXWdHs300ccpPx/FxvsrIkVZHOB/vrJNaX1fFwabmFm94NMCxXYe Fkmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=qz4FXzgqWUyDC0WXfzbwXReRU3pBHX9KhAHtwyPe0w8=; b=ThIC+xgaQrpXr+HjSspxIInii+3dzcOfTIBAi9Bf5ZTezoDLR12eAu2EWFoW670vjo xpCW45DM8bWEef4MvqvRsNEWeKwFC+Bc4V6bB39klIRty0nTmZ7rl3K8WB1XxunVdeDR Ltt11gBvevuGBFAB2+YH+EpFgS8Rwu+NeCAE39mS6xkaU9XFPc1dKXU9R/WGfme1wFb/ AfX6D3meIZlBO69Pv6XBGUQ0oZ2Pp0SxCyvzooGMckI7vH2gvv9ZwzHGkSemwbliVeBR 0MVDJt1fhxCEb5jt6KFTuWSCymLD8ef3NzCQWsJKIJ6VyBYTxNTwPTXl2UMcW74VBldz pLEg== X-Gm-Message-State: AKwxytefgoJ3GDRHYTImjN+ypSCfF7XnfpDc63p0fvxpWCtXnKNRKtCU aeh6WK+iNREqSueqB/OQAxdX+KLJ X-Received: by 10.98.49.199 with SMTP id x190mr754914pfx.1.1515931598029; Sun, 14 Jan 2018 04:06:38 -0800 (PST) Received: from [192.168.1.4] ([103.206.134.143]) by smtp.gmail.com with ESMTPSA id r17sm3548376pfd.113.2018.01.14.04.06.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Jan 2018 04:06:36 -0800 (PST) To: ffmpeg-devel@ffmpeg.org From: Gyan Doshi Message-ID: <0e41448d-eacb-738a-00b1-89f84e77cbcb@gmail.com> Date: Sun, 14 Jan 2018 17:36:34 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 Content-Language: en-US Content-Disposition: attachment; filename="0001-avformat-adtsenc-allow-only-AAC-streams.patch" X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] avformat/adtsenc - allow only AAC streams 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From c3da268449ca4677958856d99b0d1ce4695f0924 Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Sun, 14 Jan 2018 17:30:23 +0530 Subject: [PATCH] avformat/adtsenc - allow only AAC streams The ADTS muxer will silently (attempt to) mux any audio stream passed to it. Patch adds a codec check. --- libavformat/adtsenc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index a24f99c447..cb20d789c8 100644 --- a/libavformat/adtsenc.c +++ b/libavformat/adtsenc.c @@ -99,6 +99,11 @@ static int adts_write_header(AVFormatContext *s) ADTSContext *adts = s->priv_data; AVCodecParameters *par = s->streams[0]->codecpar; + if (par->codec_id != AV_CODEC_ID_AAC) { + av_log(s, AV_LOG_ERROR, "Only AAC streams can be muxed by the ADTS muxer\n"); + return AVERROR(EINVAL); + } + if (adts->id3v2tag) ff_id3v2_write_simple(s, 4, ID3v2_DEFAULT_MAGIC); if (par->extradata_size > 0)