From patchwork Tue Jul 3 04:22:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 9586 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp679567jad; Mon, 2 Jul 2018 21:22:40 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcgyG0W+QK2KjEt8IvJlRtfeThn2s0ihO1ZTr4XA3F41wRO4ScAtZk5gU7m0w0crxIoQxou X-Received: by 2002:a1c:b49:: with SMTP id 70-v6mr9049018wml.5.1530591760624; Mon, 02 Jul 2018 21:22:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530591760; cv=none; d=google.com; s=arc-20160816; b=RhQzzoe3+lWkYW8OE8eGVbMPyJmBPSemkZFyVa2YK7fWESTKY/dz7Aead/8nIsmMGj UbjDii4/+nCcG0NnoSij0RjAPAy1tKwBjhy49Vi2O8jBLIOeY0b3EWwBikOdSSYl0GKt i2ztXx75/QrluyEhXiyDt22KIjGGHrMyAxLULjVxP9VWGT2/TsAKXBdb9Ezb14AYAYXV 1kE52boejGg8hV+7B0Fzv7bxztm/x4NcRvhLHXtFWywJvzeMEF4IcLJDxyENNXIonDpW LspKFlekjlZpIXWaPwcFkMIT3+4swHX84l063Ctj/iIBdH0xdqV6skiAD/zeW4bUq61p iAog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=WmJVfWMbLYejuGucYnsCRMO6DErAwS5hH3P3uyApQe0=; b=YePIsRpU0WKDN3aVxSlg71rqINhS37sdOaww8brpAIXA6LiDwyBp9oo1yMTbJDggvZ vCpgTHnQISAaS57dFnFdjb/J5bU43RDWvRKqdkw5j1EXOFfvYrGymBQ4dMk9da//csFh Nqwm+nnJ1xG5gZE+BUugfxC4Z75+b9OcLAJ+JXFCMfNDoIPjnRRCxfwZDAQTKCSmc5QH jhVgqIPhd7Si9TMjB7ORTJpGN4S2nAQ2DZoHrut9+M4oX7RIVoSU7bzv1VauBZyC9hEE gljy/tZ5GOvypYBTaYjpbF4v2Bzu/3PL1cwZvPDz21qLm9hz7wG/Xh9MXueaRBq1W2IH xddw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b=OCAdo1IU; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=126.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k9-v6si153676wrg.272.2018.07.02.21.22.40; Mon, 02 Jul 2018 21:22:40 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b=OCAdo1IU; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=126.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AA8BE68A839; Tue, 3 Jul 2018 07:22:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m15-111.126.com (m15-111.126.com [220.181.15.111]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3EF2268A81D for ; Tue, 3 Jul 2018 07:22:11 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=t4NSVVmlncZsiouBJ/ ctrgl5MDsAgZPodiyeZENbL68=; b=OCAdo1IUZ7VwzNnn6+faoqpIZhgjacCqb/ tHfHX13Ni9RTaAj39YjUmpK8AUMBi9nAimM3qnQh/tHvc4ThLryd+NmJcTURefhI fAAoZmEtSLQQg9zBNehI4oUkXb43bgTsPwatwOhBviEfQmL17Qyh3J7PJO4d+1uV vF/fZOA6w= Received: from localhost.localdomain (unknown [121.195.188.164]) by smtp1 (Coremail) with SMTP id C8mowAC3DY7z+TpbQRINBw--.4762S3; Tue, 03 Jul 2018 12:22:13 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Jul 2018 12:22:06 +0800 Message-Id: <1530591729-7202-1-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: C8mowAC3DY7z+TpbQRINBw--.4762S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7Ar4ruF1xurW7Gr15Xr4xZwb_yoW8ZFyxpr 13Xw1UGry3XrZ5Ca4vyrW5Aa18CFyagFn7W3y2qw1jkrWSvrWkJr98ZrWIka92q392qFya 9F90yw4UZw4UJrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07Uymh7UUUUU= X-Originating-IP: [121.195.188.164] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiZxV46VpD5zlGzQAAsv Subject: [FFmpeg-devel] [PATCH v6 1/4] lavc,doc: add avs2 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: hwren --- doc/APIchanges | 3 +++ libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 7 +++++++ libavcodec/version.h | 4 ++-- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index efe15ba..3372118 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2018-07-xx - xxxxxxxxxx - lavc 58.21.100 - avcodec.h + Add AV_CODEC_ID_AVS2. + 2018-05-xx - xxxxxxxxxx - lavf 58.15.100 - avformat.h Add pmt_version field to AVProgram diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c90166d..1ac9092 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -409,6 +409,7 @@ enum AVCodecID { AV_CODEC_ID_DXV, AV_CODEC_ID_SCREENPRESSO, AV_CODEC_ID_RSCC, + AV_CODEC_ID_AVS2, AV_CODEC_ID_Y41P = 0x8000, AV_CODEC_ID_AVRP, diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 36e9a9b..c0ed4d4 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1395,6 +1395,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSLESS, }, { + .id = AV_CODEC_ID_AVS2, + .type = AVMEDIA_TYPE_VIDEO, + .name = "avs2", + .long_name = NULL_IF_CONFIG_SMALL("AVS2/IEEE 1857.4"), + .props = AV_CODEC_PROP_LOSSY, + }, + { .id = AV_CODEC_ID_Y41P, .type = AVMEDIA_TYPE_VIDEO, .name = "y41p", diff --git a/libavcodec/version.h b/libavcodec/version.h index 39be9d5..d49317f 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 20 -#define LIBAVCODEC_VERSION_MICRO 104 +#define LIBAVCODEC_VERSION_MINOR 21 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \