From patchwork Sun Sep 20 08:07:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 22519 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 D54C6449516 for ; Sun, 20 Sep 2020 11:07:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C09BC68B7C9; Sun, 20 Sep 2020 11:07:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40133.protonmail.ch (mail-40133.protonmail.ch [185.70.40.133]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1077668B7C9 for ; Sun, 20 Sep 2020 11:07:26 +0300 (EEST) Date: Sun, 20 Sep 2020 08:07:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1600589245; bh=cqVupWSfuPYxv5vcP8D+RQJEhOUXit/L7gKKtwNSB+I=; h=Date:To:From:Cc:Reply-To:Subject:From; b=jdhF2IbKkw0JOBGN5HfTvzw+RXNFvj16K8Eryds1NvveU+wYW/iwe5vpXogDokORO 1AMdDihqGT8+9yi4lOoCPzIrb4X8fmVnX6YUWdU8eUvmqV8oeKF/NlqNeKKTHYg0U5 n/RAamvOqsMfYx11+e0gewL8bkixvIw8J3NRf6juu1ggmVTcju2EWrFyjpVror1tjE R05k/Z4UjmbVvOyIM0eefBub+dbNE18xd8SLPS1x57uMVjpY7DBMOP6ZpZtcBzz6nb iKa5rWo9K5heHGDQ6/RX78m7y1zb2ieOEl4IotZErRUiPU47/nS8zGkYLVsj2elWLY HbxZsMTijqPJQ== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200920080528.26200-10-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=10.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mailout.protonmail.ch Subject: [FFmpeg-devel] [PATCH 09/10] avcodec: add "Argonaut Games Video" descriptor 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- libavcodec/codec_desc.c | 7 +++++++ libavcodec/codec_id.h | 1 + libavcodec/version.h | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 9e73dcba27..713a45ddc9 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1798,6 +1798,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Kodak Photo CD"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_ARGO, + .type = AVMEDIA_TYPE_VIDEO, + .name = "argo", + .long_name = NULL_IF_CONFIG_SMALL("Argonaut Games Video"), + .props = AV_CODEC_PROP_LOSSY, + }, /* various PCM "codecs" */ { diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index e4eca5d580..e730e5ae4a 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -298,6 +298,7 @@ enum AVCodecID { AV_CODEC_ID_PFM, AV_CODEC_ID_MOBICLIP, AV_CODEC_ID_PHOTOCD, + AV_CODEC_ID_ARGO, /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/version.h b/libavcodec/version.h index 5ce4ba55d9..85b96c8c20 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 106 +#define LIBAVCODEC_VERSION_MINOR 107 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \