From patchwork Tue Aug 7 10:39:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 9926 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp4340693jad; Tue, 7 Aug 2018 03:39:59 -0700 (PDT) X-Google-Smtp-Source: AA+uWPy4reQjksXKmWtCaoRDExsu1SCXML939O7VXkRtIyMmFm5tbVAMul5RiHArE+zLttk4VXDW X-Received: by 2002:a1c:3413:: with SMTP id b19-v6mr1363806wma.21.1533638399433; Tue, 07 Aug 2018 03:39:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533638399; cv=none; d=google.com; s=arc-20160816; b=c+eKl2ejXSH4EjrruItk7IrRFQcswF9dgOj/Kn+lWldc5zdR/lyXHTX6Ip2wQ9wCY8 3pLv6GPcMlil6I0W1nE40QuWx9Sb2erZjqqgYNV3HU6XhNVVu+IRra1yQrpmye8xgV5x PIE4uKGRL6aClJRTn0tcloaBTBu0k04e1Yni76HLbBn/ANc1zQV7LhLFv/2yBED+pUyC v5roGcbG4ri5aYD3lXKnSRwOMg+EEQehcXy6dBiQw5y8FCX637Wbq85vtfxj9aKAwWhj xnlZGGb7tCTi4M3De5k7GBorFqIvYMywv0GDWXOiFoKUxTujGfX8xtd/c6t7UHeoLkkq gEiw== 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=LrShniRHiA148oErqXtPVhkbFnm08XtP6t9EnHaDVbA=; b=fsjcm++Dfc7zpPTTmdsOs6n8R9DmqwNY+QrA4e3O2Umr9C7Avzwa3JrFfwNDoAv8x5 JxCEJHnE80hRvSe1YBdsOiSOPZBwXiffbIXyUjMZgs182traKT7xXP4QxXVpm/wY/mfz FhfzNTrDYv+8hfV2lmjF7VPP5UnnwjR2S68txKnK6zMK3nL4IKjug5z0FqwdaXP1eT3t TrQYim0SmcrWIGdIqqIqmSrHMn01KU/XvTqax01Ev2dKS+AS3k+7qCm56Y1qeq6RiNB3 Gc93kAPvEPvbfrE0ZfYo5482j6WC1VoYo7vyRL4G/YqYZXALojZSejSTzf+RUR9fe2Tg fz8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b=Gs9peVph; 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 c10-v6si771256wrq.394.2018.08.07.03.39.58; Tue, 07 Aug 2018 03:39:59 -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=Gs9peVph; 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 512F268A0D3; Tue, 7 Aug 2018 13:39:36 +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 F136F68920D for ; Tue, 7 Aug 2018 13:39:28 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=lAkUbWwX9Pu3eaE6Ce 1GLqhYn/ZWI59yxTo2Yrw5SqQ=; b=Gs9peVphuWrS97jGrmjXYxbkP6kC/litDW uyaHvt6tDKVoDDhhgo4uT3Q/zQ6rxzBWX7obZ55BuJnwa0zstE0esnj/7ds2pLnB mpchTrBzYG+2nXO4rsUHlYP03j4Vln4JK7HYnZV04SFSONZ6jNA02Y46FDsVyiNl mdsdsVYAc= Received: from localhost.localdomain (unknown [223.96.67.129]) by smtp1 (Coremail) with SMTP id C8mowABXJhPvdmlb+hOiEg--.34588S3; Tue, 07 Aug 2018 18:39:45 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Aug 2018 18:39:34 +0800 Message-Id: <1533638374-4762-1-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: C8mowABXJhPvdmlb+hOiEg--.34588S3 X-Coremail-Antispam: 1Uf129KBjvJXoWxJw1ktw4kCw4kZF43Wr4fAFb_yoW5GrWfp3 ZrJw4xtFW7tF95Aw4kJF42vFWDCr98WFWxG392qw1FkrWSgryqqF1FvF9ru3Z7ZFWqvF9I grsIq34DXr18KaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jDXo7UUUUU= X-Originating-IP: [223.96.67.129] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiYBGb6VpD5VnrEAAAsd Subject: [FFmpeg-devel] [PATCH] avs2: correct avs2 description 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/decoders.texi | 2 +- doc/general.texi | 2 +- libavcodec/avs2_parser.c | 2 +- libavcodec/codec_desc.c | 2 +- libavcodec/libdavs2.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/decoders.texi b/doc/decoders.texi index 9439b7b..31e96fb 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -49,7 +49,7 @@ top-field-first is assumed @section libdavs2 -AVS2/IEEE 1857.4 video decoder wrapper. +AVS2-P2/IEEE1857.4 video decoder wrapper. This decoder allows libavcodec to decode AVS2 streams with davs2 library. diff --git a/doc/general.texi b/doc/general.texi index cd725bb..3d15840 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -19,7 +19,7 @@ explicitly requested by passing the appropriate flags to @section libdavs2 -FFmpeg can make use of the davs2 library for AVS2/IEEE 1857.4 video decoding. +FFmpeg can make use of the davs2 library for AVS2-P2/IEEE1857.4 video decoding. Go to @url{https://github.com/pkuvcl/davs2} and follow the instructions for installing the library. Then pass @code{--enable-libdavs2} to configure to diff --git a/libavcodec/avs2_parser.c b/libavcodec/avs2_parser.c index 520e98a..1c9b342 100644 --- a/libavcodec/avs2_parser.c +++ b/libavcodec/avs2_parser.c @@ -1,5 +1,5 @@ /* - * AVS2/IEEE 1857.4 video parser. + * AVS2-P2/IEEE1857.4 video parser. * Copyright (c) 2018 Huiwen Ren * * This file is part of FFmpeg. diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 2fe4aaa..1cbb241 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1398,7 +1398,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .id = AV_CODEC_ID_AVS2, .type = AVMEDIA_TYPE_VIDEO, .name = "avs2", - .long_name = NULL_IF_CONFIG_SMALL("AVS2/IEEE 1857.4"), + .long_name = NULL_IF_CONFIG_SMALL("AVS2-P2/IEEE1857.4"), .props = AV_CODEC_PROP_LOSSY, }, { diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c index 12db1f9..70aae3e 100644 --- a/libavcodec/libdavs2.c +++ b/libavcodec/libdavs2.c @@ -163,7 +163,7 @@ static int davs2_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_libdavs2_decoder = { .name = "libdavs2", - .long_name = NULL_IF_CONFIG_SMALL("Decoder for AVS2/IEEE 1857.4"), + .long_name = NULL_IF_CONFIG_SMALL("libdavs2 AVS2-P2/IEEE1857.4"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AVS2, .priv_data_size = sizeof(DAVS2Context),