From patchwork Tue Jun 7 11:58:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 36088 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp6826802pzj; Tue, 7 Jun 2022 04:59:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2nW7khgiWr438vbhCcMdYuJnnP5DUaDnFdZlRBjB1YBjYPMlQt+9c3aWf+rjnGjkq4AoV X-Received: by 2002:a17:907:7811:b0:6ef:a896:b407 with SMTP id la17-20020a170907781100b006efa896b407mr25462448ejc.645.1654603144743; Tue, 07 Jun 2022 04:59:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654603144; cv=none; d=google.com; s=arc-20160816; b=DnAjsOZ9vxhE2QchMhgYASaIQhVqeSSReGK7NjlPR9UrOkUKKcG06D2dYHD+8sCbB2 9/ooeuBPyXFPjGGsCdl0LsgW59Jq66kvmz9OuTbuSu29gHt+ZyhKSBC0v0BqpWt4j4B0 x9RQJrL3dQJpOhDtxUZc2wktGnZZjcvz92zdAXgF8sFSpWZFD5nd6XbGC1dfu5bU0n7q 5dcrBXXLB+NGyncQlJy8kGZ+m++n1hxzQRw5KsXq/3dNpYVGhX6KZCQK66mx1WH3whgi 1zQtR/u+kaex78Ao2eHHbSPRSori7LwJdIe41eBEN4S8OHFCtNoV1rs2tlaNXypj/jEb JttQ== 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:mime-version:message-id:date:to:from :delivered-to; bh=7LOwuKm4FRr+9Q5F+ASZnz29dBEPMGNa1T0AhmmTArM=; b=cHtPDiTBU0s6/fWaZxjyx02FBqLsecdqg9BAdJWhfIWrHnMRTc+a6u8/w/mSZOgg4C Gucgje8LBseRExyng52GkHu9HUNu7SnkW2s/qCvQPV2DtoZzTl3Mr88dMQ/4AiRI9GGi kX56KsSlahc9x4CTINb7UNoaDOqKLhxO9qqbif/rds/qG9J7fijGT9Eu3yop31kVDN/h TGiuaZYmddR/7j42M4TUYHgZrxYt1BkyxrpWhkvxj82Koil7pTQdEOIDuX2U9B8xPFYm /8pAB3kN0rETUb3MkvVrUju5LmYUa7qOjpBLSISCDT+z5zf2igRA+C29aRNe/8otdTDd HDMQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qa35-20020a17090786a300b006feb3a01b16si13233166ejc.683.2022.06.07.04.59.03; Tue, 07 Jun 2022 04:59:04 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6597168B65E; Tue, 7 Jun 2022 14:59:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2FB2368B5E8 for ; Tue, 7 Jun 2022 14:58:54 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 88E07240175 for ; Tue, 7 Jun 2022 13:58:53 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id CyctTgNIUO-E for ; Tue, 7 Jun 2022 13:58:53 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 0F4552400F5 for ; Tue, 7 Jun 2022 13:58:53 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 4FDC33A0A3A; Tue, 7 Jun 2022 13:58:50 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Jun 2022 13:58:39 +0200 Message-Id: <20220607115839.18515-1-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavf/matroskadec: stop mapping text/plain attachments to AV_CODEC_ID_TEXT X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 0Fwqg1cc2E+s There is no reason to think that an attachment will contain text subtitles. In addition attachments are exported in extradata, so the AV_CODEC_ID_TEXT decoder would not do anything useful with it anyway. --- libavformat/matroskadec.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index de73f97aca..cd30b5f7a4 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -806,7 +806,6 @@ static const CodecMime mkv_image_mime_tags[] = { }; static const CodecMime mkv_mime_tags[] = { - {"text/plain" , AV_CODEC_ID_TEXT}, {"application/x-truetype-font", AV_CODEC_ID_TTF}, {"application/x-font" , AV_CODEC_ID_TTF}, {"application/vnd.ms-opentype", AV_CODEC_ID_OTF},