From patchwork Wed Sep 9 06:02:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22226 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 8B21144AE3D for ; Wed, 9 Sep 2020 09:30:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5244368B7DA; Wed, 9 Sep 2020 09:30:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7EC1A68B783 for ; Wed, 9 Sep 2020 09:30:28 +0300 (EEST) Received: by mail-qt1-f175.google.com with SMTP id 19so1179955qtp.1 for ; Tue, 08 Sep 2020 23:30:28 -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=W+ZnjixDCQ2UTuTvgBdZ8CQD9ITnpae7EqJHY0iskUY=; b=GkdMfxoDXNuWMLuqacFouzHE1qaLBfMFPj1idhilFn+48mkZC1oKWjtrUNwhNaeeTq DHMDvuv3T6qbrVghlZBFHNgLxoRzzQkHiPcFZv1yA/zzgYmxj06RDJoJK1JkNnPSF4zs mWv3Od+EMCTCUvDhYeUpG6Jomz/Lado95Hjr8EDNqXilMkKGftEfwtWdEIfHNCQS1O2j OZteEETRdBFkcDRO9847akvLW1ywGkxPRwIZPcDgvu6te83qX8DE4HzyuI69j8IWPG/R aFA25qqNrdSy7ACw1EXZbKZrmLS214p548egrKEuC1tdqvok17zQpaB5uWLk1Pm9m74Y Bj1g== 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=W+ZnjixDCQ2UTuTvgBdZ8CQD9ITnpae7EqJHY0iskUY=; b=CPOtduGqfyP+kbKeHsyJ8vK/nbPma+gMfITwfw/4MUXTMp1tpBGorTdAksdWeLlmWq CIOMAYnVvFVPURQr1bX1BqPGyfKRYIvUQJadQMmvAKXZ+pkLaOLZkmOHjbtfsYFhGhfs h7O+Qb1vUTIZsJ6eRdGPC7yun8DgMFv6m0R2DgZIxCmh+l8Ug/S7g38JMTZtAgBdxKnK smFicLhcxGPCVh43zkBkAqr5pq77mO70KXLEqPbHZEhE39WhX9xDRu0CulvLfdFTT9WD byxnLfUAKwG75eTgPrOma6GT+mJ3znZHk77paR6/Bkvx3pwCMc2VTNLmCnDt8vRJWTef fo6g== X-Gm-Message-State: AOAM532HpPiU/UPQ2JpoFNgbWgIOh5T7/hM/NTtrze4MQLhlx1s0/Z4y rjhMH2TKDUA7smlHY+XzWo7pJCJCpUXp X-Google-Smtp-Source: ABdhPJwrVC4dGSKM1FbOQcBO8VUUOqs7Z5d3yJkxsnThCSdSBVWvCpRo+ITxAL6GJkmNRK1bLWvFLQ== X-Received: by 2002:a02:8802:: with SMTP id r2mr2644580jai.75.1599631350626; Tue, 08 Sep 2020 23:02:30 -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.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:30 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:13 -0500 Message-Id: <20200909060217.25794-11-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 11/15] lavf/flacenc: use codec-desc-provided MIME types 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/flacenc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index b947a3b067..ebb0ffb967 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -80,22 +80,17 @@ static int flac_write_picture(struct AVFormatContext *s, AVPacket *pkt) FlacMuxerContext *c = s->priv_data; AVIOContext *pb = s->pb; const AVPixFmtDescriptor *pixdesc; - const CodecMime *mime = ff_id3v2_mime_tags; AVDictionaryEntry *e; const char *mimetype = NULL, *desc = ""; const AVStream *st = s->streams[pkt->stream_index]; + const AVCodecDescriptor *cdesc = avcodec_descriptor_get(st->codecpar->codec_id); int i, mimelen, desclen, type = 0, blocklen; if (!pkt->data) return 0; - while (mime->id != AV_CODEC_ID_NONE) { - if (mime->id == st->codecpar->codec_id) { - mimetype = mime->str; - break; - } - mime++; - } + if (cdesc && cdesc->mime_types) + mimetype = cdesc->mime_types[0]; if (!mimetype) { av_log(s, AV_LOG_ERROR, "No mimetype is known for stream %d, cannot " "write an attached picture.\n", st->index);