From patchwork Wed Sep 9 06:02:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22215 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id AE25244BC6F for ; Wed, 9 Sep 2020 09:02:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9AAC968B821; Wed, 9 Sep 2020 09:02:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f182.google.com (mail-il1-f182.google.com [209.85.166.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA4CC68B7F2 for ; Wed, 9 Sep 2020 09:02:26 +0300 (EEST) Received: by mail-il1-f182.google.com with SMTP id m1so1204746ilj.10 for ; Tue, 08 Sep 2020 23:02:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=0XPh2fxOHFXZ8IwEvrkNhLF8R7u8Kau0W7NX33pJrVA=; b=DTsRUvEROScC3SNwkJqFN4NVvZVkK1h41PkzxtQhcul4tdJL5qTYKPt84rSv8hlhyB NjPR+zOkgB5TPr4QplI6RmB6eraR9O2D8rD42HW20S7E3uAbpqJSzlEundAyECJEASDA O9QGaDnxbyheDAAVh3azteu6bS1clVQqmjJ+Y1i82Hfsae7xESF2sS6a1g1ijZHfn9c/ uBF3A8mRVigjOzW6LUXReNbKnVutsIQacpBxEtrYzLuV9GGiOFAGZl3oMR2338v6Waxf Gq0jgFW7qfVm7W3Jq7hgH+fP/zSbbopnhQFcLy1g/fq4qc4iwYgRR1OG77nG+G6XTnRT vqXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0XPh2fxOHFXZ8IwEvrkNhLF8R7u8Kau0W7NX33pJrVA=; b=tX60STXp2q4YmFwB1h8g6WchhBQwlAsXUKfU3bHDEMb9SeTU5yygBcsfPrF7myP7OS Fu8vcFV5EjUdgdprE2XyvHLrlX7lV3DxaLbWHu/N3BaUSlQGt1Yx5W7xjsCC6QZ2xseR S8D9WTUCKVJ8eht9pxzUo5d3aReLqxjlpdRI4ACpu2qgjaVipV8nZNLmW3O3rxHachLk KraYmeTItDJTHUdXdsvejVW5tPDWW+rQ6LvGRl0NcidIZG0GIVUZCtGTnt6JfIh27zbL wQWSldhMIFGqQ8HRC/96/NnDX9QaKfOq+Q2kzkMfvMJX+azuGeRtPUO8+uU4VfyVvQ+O XiHw== X-Gm-Message-State: AOAM530iyztxuZuBOdl9nqAbTGjW9cQmTAo0vLEkkgiV1M7eO9UQSnfy y2UW0azg6ko6V9NabWbrwD1IsWLFs7Uk X-Google-Smtp-Source: ABdhPJyB2z6aqU8mDDsV1+ghrmG2T0FtFCwIJIg0C5AzMgIgHw3N4zH5hJcOpz1Q1INsi0RVs2GD6g== X-Received: by 2002:a92:35d0:: with SMTP id c77mr2030158ilf.183.1599631345081; Tue, 08 Sep 2020 23:02:25 -0700 (PDT) Received: from rcombs-mbp.localdomain (c-73-50-128-8.hsd1.il.comcast.net. [73.50.128.8]) by smtp.gmail.com with ESMTPSA id j20sm864575ilq.6.2020.09.08.23.02.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:24 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:07 -0500 Message-Id: <20200909060217.25794-5-rcombs@rcombs.me> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200909060217.25794-1-rcombs@rcombs.me> References: <20200909060217.25794-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/15] lavf/matroskaenc: remove text/plain special-case 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" --- libavformat/matroskaenc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 233c472b8f..d9caa3e728 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1706,10 +1706,8 @@ static const char *get_mimetype(const AVStream *st) return t->value; if (st->codecpar->codec_id != AV_CODEC_ID_NONE) { const AVCodecDescriptor *desc = avcodec_descriptor_get(st->codecpar->codec_id); - if (desc && desc->mime_types) { + if (desc && desc->mime_types) return desc->mime_types[0]; - } else if (st->codecpar->codec_id == AV_CODEC_ID_TEXT) - return "text/plain"; } return NULL;