From patchwork Wed Apr 4 10:23:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 8324 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp4710709jad; Wed, 4 Apr 2018 03:31:35 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/wsDery/WKNDte9KiJYgE8uqrwgm75peF6+70UZG3dBJdeFwbJX3tZSYJfcEaDDSUx+xSr X-Received: by 10.28.17.142 with SMTP id 136mr6194020wmr.38.1522837895399; Wed, 04 Apr 2018 03:31:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522837895; cv=none; d=google.com; s=arc-20160816; b=rRU46T6WdANbUN42AKklddjCfx1UtqMn8nBRUV7yseZ3JM1o55s71TFFIya1dRG/ZP i+IQpYKtZ0pSfRU9Ul0oC+EYb34HQViQDK+6Knn4H7ThXTTiNg40Sko49ZBoCbNM54Gi bqjgmxy2DIzMRPx4NemVEAnOIwrTOqP5TliwmBG4xcY5JVlftuZoysgVr+EFq0xFIj6+ syXBI6nzwGBS24H2YwSnz9v5kfQiTbFwvUpMthYiytA+xTWiU35JS/ZVWeOP1iG03vm6 5Gp2fHm/QJi1yfRexzt3y/PsMJFux8fEzRI3sbfjf1c4p++AdTV7ZOwI+WGRTlDuGaRU VIrw== 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=3FJYryeMGcORqJuyWpw5lG4wL/y8NpB6yHQ9qlncQQc=; b=n2+zyyimvAqAXcMGUsQ0D2dCtRaYRb3qoauyzChxPjaeaq6q9AMjiXPbpD/BO10Efi UfmJw7X5tl+WAor6oaO1+Lu3Nh6hVUUDeMx9Iwx9ncRqu/NH/6OkBiDmuRrV1pC8gyDG X1G/r26w84+Q8X50yH3Hb1PMHpx3MuFJ7gh3DdQMsFLhGQnaX4IrhRNeN1tP2f63f7gw ajfbA/bn06pDxU1bmY63XIWB5GO5muyLM0SX/QDKfnsGVhoy4juqn/gVz8jb68WvvSrl tYZ0rCDtjyh9qfbtUM6sbqVAIV99WEMZnovvQlHIR9XqsREIp5BXuPtA6FUt1Yxgs5Dd EuIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nmVwfOWX; 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 s130si3620900wms.224.2018.04.04.03.31.34; Wed, 04 Apr 2018 03:31:35 -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=nmVwfOWX; 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 D9AF56805E8; Wed, 4 Apr 2018 13:31:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f48.google.com (mail-it0-f48.google.com [209.85.214.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1045A68043B for ; Wed, 4 Apr 2018 13:31:05 +0300 (EEST) Received: by mail-it0-f48.google.com with SMTP id f6-v6so16242973ita.2 for ; Wed, 04 Apr 2018 03:31:26 -0700 (PDT) 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=mweohPugfWaUs8kBH38ZEmITUW7MEeBDQB1JmrfemeU=; b=nmVwfOWX0k749j4RgNz6lgZKi2iVKq2i5BGmyeQB02Wiyaztb7a2jUb/7KijZS0Bjd IdQoftFMR6rfi2Z970NiLurR+b3utRjyn2zZYzNYZgqMM7WvnTVTuCZoDcd7Xg853gi+ o3R/EqpN0GR7Bg7hvjYbN89X+3pf+jWE82aAonWMmXfOSRbKeYXmtnSYqWHbLoIjzZ8Q AUX+oD6aymgD1A9MTgpnmrkWnboLliqHFII41Cus6hPAxK6pgBEMvexG6c6+xsPZq2WM EQ+CcYKUl29r/1uErrJ//+OGhlAidY4a6HvgApv0j2eOdTr4tv0NLBmcrERerIoFoFX2 B9Dg== 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=mweohPugfWaUs8kBH38ZEmITUW7MEeBDQB1JmrfemeU=; b=QEgkCXDw9ghhDIvDZYooiefBmMOQEfmnxTqSUIwEzMPO+FRKkHNOtuTJ/X3nX6ByuI mWWF6dZec5+LO6TVdLrmChkV9tvAt1D3sPWVWPeVcCtTNqGidyM3+Z1x/QWCDLCQ2uTC zc7lzt8eKnIqSWGqhzK4qr//gmF1aZeb/+tUX3B8RNMg7WHsgJmqvXXXcFIgXTwftviN HkndRQWFkfbpK7zKG/i7UyPBLsjkqZ14ZFAIUc4Zl2UNIAjdVluvhrUN0acp7Ut8UWFH qvW4u0GV2VpmmYXhm7OaNgE7EwWBaZSvs2O1daVIiN44MefDdF4/PztHeW1PYVNPSJuV RQwA== X-Gm-Message-State: ALQs6tDCFPSi/m09UQXCOS5zeeRN856lcl2v4hw6EHeZQKK7B7nXK24O WCv19/uQEOMaWVdvQE15icZE6JYL X-Received: by 2002:a24:338c:: with SMTP id k134-v6mr8536317itk.86.1522837409530; Wed, 04 Apr 2018 03:23:29 -0700 (PDT) Received: from [192.168.1.225] ([103.206.134.222]) by smtp.gmail.com with ESMTPSA id 15-v6sm2097544iti.9.2018.04.04.03.23.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Apr 2018 03:23:28 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org From: Gyan Doshi Message-ID: Date: Wed, 4 Apr 2018 15:53:25 +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="0001-avformat-rawenc-check-stream-type.patch" X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] avformat/rawenc: check stream type 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 f86916b9e1128a4e41501f4d5b189749a344862f Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Wed, 4 Apr 2018 15:45:18 +0530 Subject: [PATCH] avformat/rawenc: check stream type Validate codec of stream to be muxed except for data muxer. --- libavformat/rawenc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 809ca23b1a..77cbc5f6fc 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -39,6 +39,16 @@ static int force_one_stream(AVFormatContext *s) s->oformat->name); return AVERROR(EINVAL); } + + if (strcmp("data", s->oformat->name)) { + if (s->oformat->audio_codec != AV_CODEC_ID_NONE && + s->oformat->audio_codec != s->streams[0]->codecpar->codec_id || + s->oformat->video_codec != s->streams[0]->codecpar->codec_id) { + av_log(s, AV_LOG_ERROR, "Stream not of type %s\n", + s->oformat->name); + return AVERROR(EINVAL); + } + } return 0; }