From patchwork Wed Sep 9 06:02:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22227 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 88DC444B44A for ; Wed, 9 Sep 2020 09:31:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5F53C68B817; Wed, 9 Sep 2020 09:31:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD94568B6F5 for ; Wed, 9 Sep 2020 09:31:14 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id n14so1265401pff.6 for ; Tue, 08 Sep 2020 23:31:14 -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=BBJhzMDnwFwJbIvS+2O2xUvPOpuezncL2HN9A2/cWVg=; b=VNEspUsAOeugs1S4PzdsmiRBksnqLP3HvCgBcXuTvSYMLG4Bwxu5yOk5rucL6ghs5N XvTBfCIlfOZ31TwLotfy/DYGY4KhYIxjAWL8Q8oX0246caHe8EQp1xR9pcSfOjA+A/Ug CuThjzWpXpqOYijkKWFADcCEFlGJjMAu/mGfP72Rvy4MXFO794d1fgaA8M0wnM6TgDf4 PGwMqmC3/6R5KkEPeAWOpsGtlR9wjDW5BjPOUiUyTGoVJhlEhI4DRs7nwu/mk5PlclUW hdhbFJ/f3TuFXCfw1dLuyJjGS8J4/aNWS6p0Y+csbCwFxVAuIEGxOl2S6H21BIxP9kJK pB+Q== 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=BBJhzMDnwFwJbIvS+2O2xUvPOpuezncL2HN9A2/cWVg=; b=HnqkrC7EEluRrOyhDig05gWR4dBmyKKDdJJLTQghwj/4EBLBnHpmgnJGtXVazjA2Mc KnKNFpFv0GBXuCLAwun9NvmJSHOs/HFo2suSqK8UrDQ+87zH7PxljNu43e5+qxbIar+Z JghdQvsscBUniVZdYPRJ5jwcBscXxwGa6LplF/HIwjm3y/iZTHjfdCVqutCcg5y/VNxX 3RU/3sqVPYAPoGCu/1xYYeaHR2czJJzE66xHsBaDNjAMxerSVCHHAFPdhcIWDIl+Bf2g L9MpxXLBfLnBRBAQyS4Q1osw/f+xsrci4zw3kUvkdLHdm7OSSCGswms8ZccUMHAo0Fwv W8+A== X-Gm-Message-State: AOAM530FKQTJr6lePt73afa0C9CtBgWmMtNZI4N8usgo/H9Mvcru0qqY Ql1V4LmUs8nuVr7oKCRyp/pp3gnT664s X-Google-Smtp-Source: ABdhPJyi42Ogm7PDVqOErPgNTKE4tk2yM2iGHjbglPJoI4K1Oe7NnWgAunMiaCEcuIMjnPFrF1LokQ== X-Received: by 2002:a92:d952:: with SMTP id l18mr2081501ilq.97.1599631351966; Tue, 08 Sep 2020 23:02:31 -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.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:31 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:14 -0500 Message-Id: <20200909060217.25794-12-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 12/15] lavf/mp3enc: use codec descs for query_codec 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/mp3enc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index a3586e1f86..eb8cc2e22f 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -489,12 +489,9 @@ static int mp3_write_trailer(struct AVFormatContext *s) static int query_codec(enum AVCodecID id, int std_compliance) { - const CodecMime *cm= ff_id3v2_mime_tags; - while(cm->id != AV_CODEC_ID_NONE) { - if(id == cm->id) - return MKTAG('A', 'P', 'I', 'C'); - cm++; - } + const AVCodecDescriptor *desc = avcodec_descriptor_get(id); + if (desc && desc->type == AVMEDIA_TYPE_VIDEO && desc->mime_types) + return MKTAG('A', 'P', 'I', 'C'); return -1; }