From patchwork Mon Jan 29 07:13:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 7442 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp3629715jak; Sun, 28 Jan 2018 23:13:24 -0800 (PST) X-Google-Smtp-Source: AH8x227Jm4FtFa8qJz3jUev0cjRbX79w4kGlvj0yCBYUVfeLmdoTLel9G3eOCkm5u89JdhHndN0A X-Received: by 10.28.135.208 with SMTP id j199mr16903565wmd.151.1517210004288; Sun, 28 Jan 2018 23:13:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517210004; cv=none; d=google.com; s=arc-20160816; b=VDPyaXYJcm5dWVDGEps75bJ5oB23JlBmtafenj/HRzQGXFy7vTWIKRa224Lgy+RTi7 /ysto5q1Mj1HxJ1AdCuFOMmWwg+F60Gba3suMxe6UkKBYG13M4mn2IzX6vNiYAPmd7iT Ut4tA0Rv13g0T9JMBhYyNek68TZg39kPTQY1FM8800k7O2beAyuE35LIiHofKnt9Z79P NeX7tqjCVwsEVU1PGbfXxr4tdbNE+1LwOHAHA7Cd+v1Dcp8hah6IaNnbIKfWPZQDKv46 NkPJmE4+0++huaBgjgQcvX/Idalxu7RaJ8/sXYjV6ezrCSd6lEGY2lqp1q9UH0OlqFjk NrlQ== 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:in-reply-to :mime-version:user-agent:date:message-id:references:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=dLn0ZL3UfFLScGinWw5vkfQnU8eqc2D6XCjFNT7vSN0=; b=L9OMtoYpJAE72QP/Pukctmbd/D8r95jY238vU+3T0C/dc8RsdTurYp8WHJttNFqmS9 ElcsbgGN/dty8Z0rW8F9GKXZ3+mEIkx5ScoRpQtNz8n8MGOQevp+RHrYywz7NcXMDdN1 l0s1RWxxY6i6uvIMtqG9FI/JTg/M1aMpoYoXVxyYyXogoDAqiNVe8zAym6RffgnH/gwE zTcYDEYQOxTkk1xViylKCF3q7IMKK5/ZKTTLmtCXuzdK9AtUXHuk0hy5KXRbJe3kNv9q SQLEJFvH4FKHpAM4uyShSnoV8qZcO4/2AN5IcZFUaR/kR4SoJmDCLL/STl0S1vARFCk+ ynyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=vXjeQS/e; 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 d13si7113178wmi.77.2018.01.28.23.13.23; Sun, 28 Jan 2018 23:13:24 -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=vXjeQS/e; 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 B4B6A68824F; Mon, 29 Jan 2018 09:13:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f194.google.com (mail-io0-f194.google.com [209.85.223.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0D87668824F for ; Mon, 29 Jan 2018 09:13:16 +0200 (EET) Received: by mail-io0-f194.google.com with SMTP id b198so6534638iof.6 for ; Sun, 28 Jan 2018 23:13:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-language; bh=zWMRIwiJxA+7fdS2dTG/fD6HNuU8NVnAXD8L8/61YlQ=; b=vXjeQS/eWCM3/1rElhi0UOleKZWfb342ZISmc/6Ovqj0jh1GHzlk6FqqMozi6pTJY8 FFeIyPgqeuBIelq2z4fh3D3ul9EK3jHBc+U9yamMbdyRHWvOGZzRNwV7Z8arOaPr5W/0 JijfFttewMAA7JAQPuK3+8Ktt4NK+AvXukW8cYNlukfU/im9w6Kk4E94vqQVOIMIiPdw 6fraRlf47RMZRfKd1Oo8cNjrfDReygzvTUmBbqP9uy/QbXE/guHWYYxdm9p6K2w+nJej ER8Vfw4d5MAEOETzP0M9jIBJW3ZuZZMSD5WKMxGT4li9Zxi02IqxwiGeadAkxZh+UQqH e55Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=zWMRIwiJxA+7fdS2dTG/fD6HNuU8NVnAXD8L8/61YlQ=; b=ZQ0K5yPn6A92F+rxRkLfD6+nUGRpgB3NDbn2+jTlwlXdzjnpDZ0EP3GJMKxwLvTm9B bnNe90E9vuqPnzhJTi1lFqqvPEXylTSfFp2Ordl3u94/YM4RcfzsY8TZYsC+c6bYi+6w OJLZc3wHgLKeq8RAGIMBKNHIopHd71P10TbHxm0L7wTOKv892AuoNSWhXd2zPAr68jNw z7tr+xni5N4B5l36p8TJ3hNlwDYX/R1gNd9GL3Z9VMHvoyQRPFf8/kjeB+o+keCb6+wW N0EOCDqfMxcigMEe9bsT19avny5mPg77Aj6iJa6a4PdweRUN5zMWF3C8wg9npTrWKmVH Gldw== X-Gm-Message-State: AKwxytfDMlmSMCOmTpUkIzUmT1BGK5bn54WsAPMr9S4HdyWX9iYTU49A JKBiOZ8RQ/qngIGJ7SY+RyFzl0ez X-Received: by 10.107.9.200 with SMTP id 69mr11121186ioj.289.1517209999946; Sun, 28 Jan 2018 23:13:19 -0800 (PST) Received: from [192.168.1.15] ([45.126.171.38]) by smtp.gmail.com with ESMTPSA id k204sm3829734iok.68.2018.01.28.23.13.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Jan 2018 23:13:19 -0800 (PST) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org References: <294338e6-be38-88aa-7add-1b2f7ce84eab@gmail.com> Message-ID: <4c270812-c742-84ff-186d-448559e3f33e@gmail.com> Date: Mon, 29 Jan 2018 12:43:16 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 In-Reply-To: <294338e6-be38-88aa-7add-1b2f7ce84eab@gmail.com> Content-Language: en-US Content-Disposition: attachment; filename*0="0004-avformat-mpegenc-reject-unsupported-audio-streams.patch" X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/mpegenc - reject unsupported audio 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 800aa096357c5dfa822157f349a0f0d23fea8c84 Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Mon, 29 Jan 2018 12:26:00 +0530 Subject: [PATCH 4/4] avformat/mpegenc - reject unsupported audio streams Only MP2, MP3, PCM S16BE, AC3 and DTS audio codecs are supported by the muxer. --- libavformat/mpegenc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c index 7a79b614ec..f3005d9518 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -388,6 +388,10 @@ static av_cold int mpeg_mux_init(AVFormatContext *ctx) stream->lpcm_header[1] = (st->codecpar->channels - 1) | (j << 4); stream->lpcm_header[2] = 0x80; stream->lpcm_align = st->codecpar->channels * 2; + } else if (st->codecpar->codec_id != AV_CODEC_ID_MP2 && + st->codecpar->codec_id != AV_CODEC_ID_MP3) { + av_log(ctx, AV_LOG_ERROR, "Unsupported audio codec. Must be one of mp2, mp3, pcm_s16be, ac3 or dts.\n"); + return AVERROR(EINVAL); } else { stream->id = mpa_id++; }