From patchwork Mon May 28 10:14:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 9119 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp1783817jad; Mon, 28 May 2018 03:45:32 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJ+rADwH1Bu3ucvHzjcILvkrMIYlQHQFJ8UXevcoOQdYL1XCwb6lgB1cXtT4DCS7T1NwzcG X-Received: by 2002:a1c:87d4:: with SMTP id j203-v6mr7906316wmd.119.1527504332033; Mon, 28 May 2018 03:45:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527504332; cv=none; d=google.com; s=arc-20160816; b=BXhp7fiHw9LHpyypxh5/+6KSeIUpU7Afpf3/YNQc67ExHFNWBybPBxLV+X0+xNch2S i5kz2T5Ad8Vi+zmRcj9p4fHeaOccZLVV5kqDKdvfgHcZegj5Vy5VUBhktXaYgekhP0zx aL6R2Mz25sqrRUlJ9Mf4q/ankxzD/mO4aWIyTRohAigc+adbpVxnB5TCBl2qPH5vwz2W +1LfC3kHiEgkbsyEjMCuKLVdZWJmvMkmurhLmup/RJyY4jEgRIZiTg0NSTcl3ZmzirfT Xb44RatomnVUoQYp8rE2svi4f07N9eS3eAe86s3hgcDtJjOYYwVSODSsN7pKblIosUvG MS/w== 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=X5cuAXtnbSxNmXXsY5EcCO7PJKOQL/p9ODqpeO6tWY8=; b=bcoQTbx5GV58HgN6fmTTS1HaOoOeKmYgHQpcfMhxq5v2Z0nPXURuihK6YfdKIFKHqG KD4704k8hFYQCklABG3hCYzdmx7ovqq3NTYXzl+eR/MzGE9EeFdTO8fgh9crTC4c9wOR puW4DbOYmcuhDi2aM4AANGf42muLnO4UBqc2VHyuCcHScz6jG46q7+Z8Mc7gYwtZ2HQQ 4z0d8Z1aVwUjhPbshDTQx/Ml4znNyb53fKtKF/8rISgeXnRxT+GorS6c9xt7fnIGdUsV d1fqPnon5YDxV3RxkwoGmPAtxgSKSfTvhVwL6kJRLa9j9Ltt6AVvISC8kZs9Li8yfcUM y1Dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b=cz8qG6SD; 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 q192-v6si10105386wmd.113.2018.05.28.03.45.31; Mon, 28 May 2018 03:45:31 -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=cz8qG6SD; 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 0BC9168A342; Mon, 28 May 2018 13:44:46 +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 A032E689CC8 for ; Mon, 28 May 2018 13:44:38 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=Z+rwNfIAA0zrpvoVC8 41GSD1j0D/dKpdv1MTlLS6a1Q=; b=cz8qG6SD+vdFhofmiRNjq5n5tU0MBAli49 LL+TdgYU12uLFMfP+jTVRBZzT45j00mbQnfn0OWMqf0tUsjUhiyJpWRI4jx8CK6w u1tF0iuBiuzUEiNJHq7acHBqaurbVjaJtKln3zO5olSS0/290wTFPt+BVnCZSBWt VSImrejTo= Received: from localhost.localdomain (unknown [162.105.162.44]) by smtp1 (Coremail) with SMTP id C8mowACHKLSi1gtboflOBw--.10333S3; Mon, 28 May 2018 18:14:59 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 May 2018 18:14:55 +0800 Message-Id: <1527502497-2417-1-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: C8mowACHKLSi1gtboflOBw--.10333S3 X-Coremail-Antispam: 1Uf129KBjvJXoWxJw48tF48Zw4fXry8ZrykAFb_yoW5XFWfpF 13Zr1UJ343XrWfCa4vyr45ta1UAa4YgFn7WwsFyr1qkrZ0yrykXr9rArW29asIvFWqqFy5 ur98J34qvr4UG3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jlKZXUUUUU= X-Originating-IP: [162.105.162.44] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbi2wNU6VpD5fZk7QAAsm Subject: [FFmpeg-devel] [PATCH 1/3] doc,lavc,lavf: 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/allcodecs.c | 1 + libavcodec/avcodec.h | 2 ++ libavcodec/version.h | 2 +- libavformat/riff.c | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index efe15ba..430a914 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2017-10-21 API changes, most recent first: +2018-05-xx - xxxxxxxxxx - lavc 58.20.102 - 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/allcodecs.c b/libavcodec/allcodecs.c index 7b7a8c7..6103081 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -705,6 +705,7 @@ extern AVCodec ff_libx264_encoder; extern AVCodec ff_libx264rgb_encoder; extern AVCodec ff_libx265_encoder; extern AVCodec ff_libxavs_encoder; +extern AVCodec ff_libdavs2_decoder; extern AVCodec ff_libxvid_encoder; extern AVCodec ff_libzvbi_teletext_decoder; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index fb0c6fa..a0dd2ce 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, @@ -689,6 +690,7 @@ enum AVCodecID { * stream (only used by libavformat) */ AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information. AV_CODEC_ID_WRAPPED_AVFRAME = 0x21001, ///< Passthrough codec, AVFrames wrapped in AVPacket + }; /** diff --git a/libavcodec/version.h b/libavcodec/version.h index da893da..219f56c 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 19 +#define LIBAVCODEC_VERSION_MINOR 20 #define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/libavformat/riff.c b/libavformat/riff.c index 8911725..4153372 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -369,6 +369,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_ZMBV, MKTAG('Z', 'M', 'B', 'V') }, { AV_CODEC_ID_KMVC, MKTAG('K', 'M', 'V', 'C') }, { AV_CODEC_ID_CAVS, MKTAG('C', 'A', 'V', 'S') }, + { AV_CODEC_ID_AVS2, MKTAG('A', 'V', 'S', '2') }, { AV_CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, { AV_CODEC_ID_JPEG2000, MKTAG('M', 'J', '2', 'C') }, { AV_CODEC_ID_JPEG2000, MKTAG('L', 'J', '2', 'C') },