From patchwork Wed Sep 9 06:02:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 22213 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 A6DAD44BC6F for ; Wed, 9 Sep 2020 09:02:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8C25668B7BA; Wed, 9 Sep 2020 09:02:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0B6668B673 for ; Wed, 9 Sep 2020 09:02:23 +0300 (EEST) Received: by mail-io1-f49.google.com with SMTP id y13so1938346iow.4 for ; Tue, 08 Sep 2020 23:02:23 -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=ft2psQ4K4ak9eZcXUqS5ZLcgKZ4vKdifvLh23ws9lCg=; b=Q3Q6/0RcSzO/kvYDucZjimmhnkIW3iUANc/RQ8A3ksxsAYavBNbd0Vo4Sxe7iCBwpa WRTBI5s8v/bJsYAD1bUUsREcrnPhXShkmF1OOvxv0IxtohqOXTFwfrAqn4qsY0UQNwIj Lq/cknnjWHqXZU2BEei89xMuwlE0G6tfEo6AnqU7d8LXd5TBqyO4bxEaVAqgNWIaUd2l f8RTodJGxXuqNc6Eh5delcll8m5dNs9KdUNmMpy16M5j5kNJgqDp1sqdy8F/SyByE1d5 TpPmQ2B0EImQrseTF9vhFdPaEnQoPt15ad7hgpe6BNUXwdB/UxYippDmopJwWmQ7scrj rm/A== 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=ft2psQ4K4ak9eZcXUqS5ZLcgKZ4vKdifvLh23ws9lCg=; b=W8G60mvS8rICIQXqudiwMeBvRzqESU+Nnp/5JqnuZ/133JG4S0GceFp7RVr0imx5Ea KWe7dgnW+Fc2xlt6N96eo+4jjidowhXP6Z/F6UCi7kvIE2/HWb+kxqPG9DEAi3HxsLTe iOJvAr6LWRC/VqLZ61ttIC3r6K3hYM6kC2bnWG+evksip7vyy86+nNlwwstfDEfHlX5A Ax4AjNqibTp6zVhYAws7KNap/z9JNaebnunWwbxfkKqtJMwFH+dI+Ew+GxQ1PmSZl6XW Z1k3EiMDGaOC+odp9tvLU4aW4qSnkY37RxBHcBuq0o1Y4hl6EDq3YMR08CGUY2okIyXu RAJg== X-Gm-Message-State: AOAM53311X7nlh49D8+0egFK1Oa3buI81T+yF0dxgoR6VCrC6Bo4dWZk BbgL65ZuouNRX5rMzUQpROe/eJibag16 X-Google-Smtp-Source: ABdhPJzTJvI47t/cUhM/Pzb2X710gQus7CroUyOB8416PkUugFpCvPFWeWMlhVq1ytghZTFdg0En2w== X-Received: by 2002:a02:a04d:: with SMTP id f13mr2585269jah.112.1599631342161; Tue, 08 Sep 2020 23:02:22 -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.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2020 23:02:21 -0700 (PDT) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 Sep 2020 01:02:04 -0500 Message-Id: <20200909060217.25794-2-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 02/15] lavc/codec_desc: add additional JPEG and BMP 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" --- libavcodec/codec_desc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 3dee640360..49a00ad264 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -82,7 +82,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "mjpeg", .long_name = NULL_IF_CONFIG_SMALL("Motion JPEG"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - .mime_types= MT("image/jpeg"), + .mime_types= MT("image/jpeg", "image/jpg"), .profiles = NULL_IF_CONFIG_SMALL(ff_mjpeg_profiles), }, { @@ -588,7 +588,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "bmp", .long_name = NULL_IF_CONFIG_SMALL("BMP (Windows and OS/2 bitmap)"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, - .mime_types= MT("image/x-ms-bmp"), + .mime_types= MT("image/x-ms-bmp", "image/bmp"), }, { .id = AV_CODEC_ID_CSCD,