From patchwork Tue Feb 20 15:17:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 7678 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.33 with SMTP id c30csp2839933jai; Tue, 20 Feb 2018 07:23:34 -0800 (PST) X-Google-Smtp-Source: AH8x226xlMRwBlcSxns9WK/VAGrOYb81kBAvwyAXAmwL2UJ6YW6ZQLcPSo40a9O1cFo3uAEkebYt X-Received: by 10.28.69.214 with SMTP id l83mr494618wmi.116.1519140214280; Tue, 20 Feb 2018 07:23:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519140214; cv=none; d=google.com; s=arc-20160816; b=AKBlRepCC08oT3uutfRFo1MeTRjGd1cPSx7/t6uPxxIjGqQjpLRF/lhzwgDWhcbvDq +m42AYou3P9qG1heUa8KKEUxm39Q7mUIUTdTLnlphIKrQS50LDpgrYe0Ei5i46oR3Cmu TSTG5ddrM5Ha9SU9s/6hslLPZ9BURIZ4qebv47d1u8pe/IC19UJeiYVwctZw5Gc1zf14 QYzIjH/0y94D6ohszJ0pkQxTOPl3aU5i4u7IGzUZWL8t+G/jVA8ZVMlHmTNLO2IJaKdU hfpwfWGR02iQOnc3PvKh65AzYV/5bOZbtHn5Th/pbPNGM2ByTxy0AIznC09s2N0+JIg/ XSDQ== 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=90T74xYK4FvbioEBWRc6sPO+Jg8k0bWSiAQnXxn5dzw=; b=cgpporUGtYvMFU/ZlqBAuEnNF0Oz+IM+UVOaY+hZx+uQdwYNEzHCeO+inbfdM4GqiZ vCfxuSU4MmQ+tHEfeyHh3klGWLl5GrXqRClJ17Zqf5cjM/ZsIxThAqaLUWxwVr+Yn+01 Y3SIM/F+yzpDuGr17rSPABux4waNw4rUjRiBK0EBdDZHu7KnJhliWAupWiYihEM1H95R cutJ/bIIcSYndbGubN/P3nIzYZ1SMoLTBIwVaxPlm1D3ijehkazlX+htdhiXoz1XMNXt YxwPCkrtuaS5JmJ8LicVqHQtxV/k+K9qxzoAlBvfgofJIH445weQDrFZpgNguK5hZLLt GZoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nT0Ixxzt; 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=QUARANTINE 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 x63si15286559wmf.220.2018.02.20.07.23.33; Tue, 20 Feb 2018 07:23:34 -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=nT0Ixxzt; 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=QUARANTINE 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 9B1F268A33C; Tue, 20 Feb 2018 17:23:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f41.google.com (mail-pg0-f41.google.com [74.125.83.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 19FBE68A198 for ; Tue, 20 Feb 2018 17:23:25 +0200 (EET) Received: by mail-pg0-f41.google.com with SMTP id g2so7227775pgn.7 for ; Tue, 20 Feb 2018 07:23:26 -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=Vpz6AaDy4eWkrypmc4G3NYznPlehpLvOzWrP5nDdTYY=; b=nT0IxxztOO5mZuv8ql/LCQeUOhEtnZATxYRJHXOEPfLYuL8PM4PT+nX48N17MwrIQj d4RLJxVHKGnrg88bE1KgA3zgb2RFO+vC1N82owOqqMzCCkg9nVib4mG1mdmeTgBZwyWI 6+NvcBw8gE7xToGH0+pKg9lp3cjRt5kM/2W4EjuGuzLq5WCKqJ9SxLnU5qmzbAS496hr YrDRVbSUJfEnqwXlsT0hvjpej2IW5hWd4eDPLnCHlP11M+qKPIlrqkZZbMNo9kqg8vH+ CIahOXeEdcQ13aap5abiLayU7PjonGaTXTXFPVIuigKga5XRtA8S5lkgp/XCqyBcmK2T AVhg== 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=Vpz6AaDy4eWkrypmc4G3NYznPlehpLvOzWrP5nDdTYY=; b=Coq+X+4qYaXh7E3T4eu4hNeEOB/iC8T/x71A6auySun/zogV7DxckY4ZI3P3H25XJ2 9JxDPYLAppqC8+PblQMVq3ix4QHGbT2IjjOrkJRa7Inm/HXaHCMueSEaAcHe9SyUR9XH n0huxpuSB5wE7vuMdq7wMpWJxZKNxIY4DEdOaBJJMdEpo6xTNPs4vJjKHdZq6jxywO1h UCCcttE19WaH9bvwGS73HZPPQ8W/9G+RHVNRDk59R1QCPXJeNq9pIOklSTweeDoCWVvV BYu0V2V06eMUys4yEeyq4zm2ZfbrTr6Ydqeoi0Sq9KpG71dtF9g5tp7DT+vewFOVDVWf T0Gw== X-Gm-Message-State: APf1xPD6JCf4X7sf9Wh1TSN4MY9EsVj6XH+67m7QZKlz2A4oUl7nEdsS zgBTRB7DCSjg7Mq4ieth7YXVCxZ5 X-Received: by 10.98.31.79 with SMTP id f76mr14549223pff.60.1519139870319; Tue, 20 Feb 2018 07:17:50 -0800 (PST) Received: from [192.168.1.215] ([103.206.133.21]) by smtp.gmail.com with ESMTPSA id m3sm23677202pgs.90.2018.02.20.07.17.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Feb 2018 07:17:49 -0800 (PST) To: ffmpeg-devel@ffmpeg.org From: Gyan Doshi Message-ID: Date: Tue, 20 Feb 2018 20:47:47 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 Content-Language: en-US Content-Disposition: attachment; filename*0="0002-avformat-mpegenc-reject-unsupported-audio-streams.patch" X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH 2/2] 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 f0aabc7b9f959dc94084fb6d9b644104fc203566 Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Tue, 20 Feb 2018 20:42:21 +0530 Subject: [PATCH 2/2] 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 4c6fa67fb8..59e3f8c83f 100644 --- a/libavformat/mpegenc.c +++ b/libavformat/mpegenc.c @@ -392,6 +392,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"); + goto fail; } else { stream->id = mpa_id++; }