From patchwork Wed Nov 6 02:49:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16130 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 3C18B447DB1 for ; Wed, 6 Nov 2019 04:51:00 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2998268B0A0; Wed, 6 Nov 2019 04:51:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2B6E68B0AF for ; Wed, 6 Nov 2019 04:50:55 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id c22so1643188wmd.1 for ; Tue, 05 Nov 2019 18:50:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kdGHwC+1VlhtC5Su6UaFOSllK8hBTHbpFH2fK5o50a4=; b=tOa6q/hmPUZim6aHfu2F8kRBaF5jbWSsI8GGuLcCnagpC+EsIAplZaDWtzFH8Zq/fF qnNd9nqXZsEHAtD7LozjjFzfeaEAZ+ppj5KyzXXqdLBA2b4jCIYTxUjY0FEFGhwqN4Mr VBtoMYO2+1oXRiuSFWluCs3wWP/bS4lRGsizxnR/L8J+v9UrrxoHN8oL5K/3BdN934rh UCuktxwBPBTKa+jK0TcpofujjE/TQTKoOy93GZOm2rEgtjZcdM3z0kvZpsnmfHJVnvOJ tS7hfFJSIqk8EaaCV2t97f8sXXxc4/OJ7vHgkS5lef7IEDJw0NxrN9pZLp0NUTbEaTcl Ya6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kdGHwC+1VlhtC5Su6UaFOSllK8hBTHbpFH2fK5o50a4=; b=Wlxj8+dqCnenvxnniwWB/pYlnYNAFUrJ1dt6W1ErxbJ2Mc4KA/DMjfzyztrG7j7uBm /n3hXvnETUDnHAtqOfIHne+L9rXcZZ6jlWlJJbhvNCd+iqNpn41Th9OFREb7H/2OysCn oSFYeb3DzAJuC/HJzPqU9nWgqvSQp5jhzXOCw6h1Ge0ewPatx8W7B70K5Emsqut8eeEt RxshINuHL79PHPZQThhJ/0KR53YPRdWXzP9UK0E+XGhbg3xblXZcZkHwjLyjSsxmOES5 jiJ0ouUpytfoJMBox0cjQyx8d9F/dd8ftr3cRl19IHUhXvn65MeBTV7/sIREUtX556ld RIDQ== X-Gm-Message-State: APjAAAXer6tcrEnHI9jsUZokHghY+FZ7mAVkMIgKPToOaV5616iJa5Px H1gIvbXpNChCrZ6w4Ti5ooZRg4tV X-Google-Smtp-Source: APXvYqynYKY6d9BZfti1kwwK7qJMHaUOJ5Pj+GJUwCLeFwETrOihoDkXbvqKqHveuK3g+EBkRSCyXg== X-Received: by 2002:a1c:e157:: with SMTP id y84mr290006wmg.59.1573008655272; Tue, 05 Nov 2019 18:50:55 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id l13sm1281710wmh.12.2019.11.05.18.50.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Nov 2019 18:50:54 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Nov 2019 03:49:18 +0100 Message-Id: <20191106024922.19228-19-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191106024922.19228-1-andreas.rheinhardt@gmail.com> References: <20191106024922.19228-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 19/23] avformat/matroskaenc: Improve mimetype search 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Use the mime_types of the corresponding AVCodecDescriptor instead of own arrays. The former are more encompassing. Signed-off-by: Andreas Rheinhardt --- libavcodec/codec_desc.c | 1 + libavformat/matroskaenc.c | 14 +++----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 0602ecb1b5..837b09e7f4 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -3020,6 +3020,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "text", .long_name = NULL_IF_CONFIG_SMALL("raw UTF-8 text"), .props = AV_CODEC_PROP_TEXT_SUB, + .mime_types= MT("text/plain"), }, { .id = AV_CODEC_ID_XSUB, diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 19d9b0bc66..f2c8a66a03 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1694,17 +1694,9 @@ static int mkv_write_attachments(AVFormatContext *s) if (t = av_dict_get(st->metadata, "mimetype", NULL, 0)) mimetype = t->value; else if (st->codecpar->codec_id != AV_CODEC_ID_NONE ) { - int i; - for (i = 0; ff_mkv_mime_tags[i].id != AV_CODEC_ID_NONE; i++) - if (ff_mkv_mime_tags[i].id == st->codecpar->codec_id) { - mimetype = ff_mkv_mime_tags[i].str; - break; - } - for (i = 0; ff_mkv_image_mime_tags[i].id != AV_CODEC_ID_NONE; i++) - if (ff_mkv_image_mime_tags[i].id == st->codecpar->codec_id) { - mimetype = ff_mkv_image_mime_tags[i].str; - break; - } + const AVCodecDescriptor *desc = avcodec_descriptor_get(st->codecpar->codec_id); + if (desc && desc->mime_types) + mimetype = desc->mime_types[0]; } if (!mimetype) { av_log(s, AV_LOG_ERROR, "Attachment stream %d has no mimetype tag and "