From patchwork Mon Oct 30 22:51:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 5769 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp3232146jah; Mon, 30 Oct 2017 15:52:01 -0700 (PDT) X-Google-Smtp-Source: ABhQp+S8EMSvKmWwqkTCz3ZpWhc+fA+y3bJNnr9dPdfvWYS6HzAXfvsxpxfiBT4rl/9I0iOsvquG X-Received: by 10.223.152.199 with SMTP id w65mr10019550wrb.254.1509403920861; Mon, 30 Oct 2017 15:52:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509403920; cv=none; d=google.com; s=arc-20160816; b=mVDfaxyYf4/q/1HyZukcGw4WXFHcwIJJ2MLKEAFHQNKKObMYX65e/WUyPom8cR8vLv FOqWsgfPwGvPaOIbp1WnR8z+kKj5RO66hRoBY1neHv01l5n0aHihPCmWeNwiuKKqMK1/ LLIv87aju0AacmU9aYcc00YA/biCnYVD8PSU9ydlwRQgRa1eRLbMp4piEo8J0Mfs8Tpk kGn4pM3lIAOL2A9cm4deD2F13yDBUk6i+Vq1jM7h2JXQuWUFMlk5ubGMjcac9cS/+TPQ agG0ZLjWBc/YdnG21hp4kLmWijohmEXwOd9ytP47tJPsh9rYQyNlBl2hWMGhheHAGAvo x94w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=wly5azPbkHK8gHHsFSE/SjLJhtLWmmbmrTrxrsAmWvg=; b=yXTgRhlVoUXlbUoNiWxpdRjF9Doyj4ktVASzaNZVg+fajrMQzk7q/qBUZYguot3/8C qnRuQ+CgAVdQUC8fWziZnaryKMt3EqJCAZ3UfJvlGqcsNBsjoNcxxLQyXULL6M0w1Bx3 gZWLbFWsHBU9UgnXTrrU7uHge43NeGMp4KjuhVZtyEysnPMcVvHbEMiTh8eYNV9h+frj oKlNZav1tYZ1E358Q30FfdC8Llbkd1S2lJ1MicQL/QHS+bkAJgFDhu5vMGQyLECQ/Bcp LqOT2y7HHTUCTqIoR/d5nAoM8Xqo/VGVSQI+T+DPSoBo4HkW3+alAU2RY6iIZ8y1cyJ5 EweA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HKGmsT0j; 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 v24si30858wrv.242.2017.10.30.15.52.00; Mon, 30 Oct 2017 15:52:00 -0700 (PDT) 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=HKGmsT0j; 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 777D1689D8F; Tue, 31 Oct 2017 00:51:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f182.google.com (mail-io0-f182.google.com [209.85.223.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C350689D65 for ; Tue, 31 Oct 2017 00:51:43 +0200 (EET) Received: by mail-io0-f182.google.com with SMTP id m16so30903784iod.1 for ; Mon, 30 Oct 2017 15:51:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=844JIysvfBNFrdUBRW2my85n4n8CGE49QXyPZk1ulHM=; b=HKGmsT0jJwinB7GcaShhHj0x5AcbgIztCdco22tWjbVQelA17MG8VC5g4QwGgLRPzj uJkSkGOimKu0sMZKTcJlbRoUHE3jItrBmQkY2l7By791/e3lfQ19+9A/B5IGcJK9OY37 tmR+itbvGDORJv4AhBzvaVPyk32upGpwjshwNTrmY4CPZ0nr4sfaFulUfSRcRl5FYxMG h073TklGHj41+crbyX2EhmKCaohDMZ5vRk5QQe1KtPr7yNd6c1NlILNvMy6I+PDgK3yF bMXt/UbMWE8If0UMXlt68SXcn8zHGc2q19DHHw9HmWWfgq3jh1K7YAhJheaYMK60zSWw 8fLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=844JIysvfBNFrdUBRW2my85n4n8CGE49QXyPZk1ulHM=; b=R/d133BwF8hlxl6/uk0u0jKvaB2ed5KhE9en9iBP3SuDPCs3bewlbh3JQ7mA3H3fGl IMQmMngglMh841hDRdoCg38loHv3jilpk56PSd2jpbcvUxyOryDDWYscYCca1ur3DLOC AwkMlxBv4xymUksKF3idPonBBvbklwXsmQZ2MrQ/QXG5v4bCxvAqnkjTR1+EHmz1iJM0 WQWVIMHzPMxr/qSgZlHbsmOCrDVGLfJ9fTOa2iFRSPbenzbeUFfCB323X9lnQOcNm3qF BfBRC7MR3VcAOa5/X3LUdIVa9+lswZjs77EdwN+9COUVuMnL00YnHUuxsF2OAoxppiB8 ag4g== X-Gm-Message-State: AMCzsaUtCIo3GjyinbnreypMrlww7sIcf6ESYx0M1IiKU7iB6Hx4nmFf HRd8arj1ZUjt5kiUR3+7xCbeQEP0svSxx9v9g3s= X-Received: by 10.36.120.136 with SMTP id p130mr491985itc.54.1509403911483; Mon, 30 Oct 2017 15:51:51 -0700 (PDT) MIME-Version: 1.0 Received: by 10.2.63.101 with HTTP; Mon, 30 Oct 2017 15:51:30 -0700 (PDT) From: Carl Eugen Hoyos Date: Mon, 30 Oct 2017 23:51:30 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/latmenc: Error out for invalid codecs 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" Hi! Attached patch makes sure the loas muxer does not try to write anything but aac and latm. Please comment, Carl Eugen From 9f8f39b402f77b53613a395129f96feee5e873ba Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 30 Oct 2017 23:49:29 +0100 Subject: [PATCH] lavf/latmenc: Error out for invalid codecs. --- libavformat/latmenc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c index c919976..29a74e3 100644 --- a/libavformat/latmenc.c +++ b/libavformat/latmenc.c @@ -89,6 +89,10 @@ static int latm_write_header(AVFormatContext *s) if (par->codec_id == AV_CODEC_ID_AAC_LATM) return 0; + if (par->codec_id != AV_CODEC_ID_AAC) { + av_log(ctx, AV_LOG_ERROR, "Only AAC and LATM are supported\n"); + return AVERROR_INVALIDDATA; + } if (par->extradata_size > 0 && latm_decode_extradata(ctx, par->extradata, par->extradata_size) < 0) -- 1.7.10.4