From patchwork Wed Sep 12 05:53:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 10298 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp4477621jap; Tue, 11 Sep 2018 23:24:28 -0700 (PDT) X-Google-Smtp-Source: ANB0VdY/s/ubQMYQejV4iupVf0LdkQs6ITxHTyqipx4QSoxzhcpFdpi5Bi/QBplLg9y/WJIpVS4L X-Received: by 2002:a5d:438d:: with SMTP id i13-v6mr290107wrq.156.1536733468818; Tue, 11 Sep 2018 23:24:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536733468; cv=none; d=google.com; s=arc-20160816; b=y3fdQwnmEDczsiXZSXroDItDDidVMk/glu+k+CH3649Vr/vZqy3up3pSTNXegw4SXx t0FjiB8m8TI8uEQ30w41EpouO67fiNZby29jobUcoWjoCNy5KxuobZFfRfj2u67v5n3I 1SkrF+Pxpw/93HpcDvNdhgZorPCePydDuEO78bRhFQKGNxYqxOSe+kKbRQ2mNDhZw0X8 NE/eo1reboVxq+cYPIZINvkLKutKTsssJDvCaRRR1Xyohsqdd8+FDj6kkyufGuUYF9e5 oLCRSy96Lph9gebnv1SVfiubfzUuuQWRkHiYygrPn+urxEasEtuqmWqCNoObO1CQN+4u BHWg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=FHIzOQygZ5pRQ+DkkDxROTpuehLCdsZI6Miht6kbe7Y=; b=BDI0NWKfBl2ars/DcrQ+5zGcHV4pY6i6DB/ojl2T0h8skQjmRrOW2Jj/Gpa+A1eqI3 SEFvGO0Zmkm6BVEpz6nuvYSdAdDavJsLAFJK4sbEGj9CZaaTePuVDwkkhOhj4ITrybFZ CdM6WFyA2qFZYH5/kcDacHr3qpYAhVAP3h99Yf48GITXBH2LDfudMJk5EgrdaxGVwuuk NAOiBKXkRqt/0nuw8lDe3W1K9B/CoaXwsvAutb3EMciACaLrvL0GLdFAY42rV1ABbscM f0p5fy3lXg7m9JkZ+kk3bgzzr1CUKl4Kd9lvDM0e+EWwPyg6EMirGxabcRvg13tt85GG DP3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@126.com header.s=s110527 header.b="Agg1UTV/"; 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 a16-v6si77696wrv.161.2018.09.11.23.24.28; Tue, 11 Sep 2018 23:24:28 -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="Agg1UTV/"; 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 00EEB68A4B6; Wed, 12 Sep 2018 09:24:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m15-113.126.com (m15-113.126.com [220.181.15.113]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE620689E7A for ; Wed, 12 Sep 2018 09:24:08 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=PJNsJXgwVsoolj/2CS jcZc+NZVT08bLvi4e5nGQ/HIo=; b=Agg1UTV/rFgJdwDSH73KLvgiFR701hnnsJ p3AksZwp1b7iUGxRDQBmeYIoBK+2jdJzMdC83sx8lVylzg3aK1bFd0IIsSszgi2l KAIkAoE1TXJ7qffCKM2O9UVN5icTXv5SyAOXgD3JHL6S+CZF1OqO3AvXZWovJf41 AGgaKQggM= Received: from localhost.localdomain (unknown [162.105.162.85]) by smtp3 (Coremail) with SMTP id DcmowAAXj6_FqZhbKmuqIA--.8400S4; Wed, 12 Sep 2018 13:53:10 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Sep 2018 13:53:08 +0800 Message-Id: <1536731588-9553-2-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536731588-9553-1-git-send-email-hwrenx@126.com> References: <1536731588-9553-1-git-send-email-hwrenx@126.com> X-CM-TRANSID: DcmowAAXj6_FqZhbKmuqIA--.8400S4 X-Coremail-Antispam: 1Uf129KBjvJXoWruw1xurWrJw4DGr1UWw15urg_yoW8Jr4kp3 WxAr4DtF15tFn3ArykZ3ZYqa45JrWDK3WkCrs2yw1vgrWFyrWUt34jvr1I9a4IvFWvg347 Za1qyFyjvws2kaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07Uv-ewUUUUU= X-Originating-IP: [162.105.162.85] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbiZwa-6VpD6bCKQAAAs9 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/libdavs2: fix error type 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 --- libavcodec/libdavs2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c index ab9e511..aa14782 100644 --- a/libavcodec/libdavs2.c +++ b/libavcodec/libdavs2.c @@ -50,7 +50,7 @@ static av_cold int davs2_init(AVCodecContext *avctx) if (!cad->decoder) { av_log(avctx, AV_LOG_ERROR, "decoder created error."); - return AVERROR(EINVAL); + return AVERROR_EXTERNAL; } av_log(avctx, AV_LOG_VERBOSE, "decoder created. %p\n", cad->decoder); @@ -84,7 +84,7 @@ static int davs2_dump_frames(AVCodecContext *avctx, davs2_picture_t *pic, if (!frame->buf[plane]){ av_log(avctx, AV_LOG_ERROR, "dump error: alloc failed.\n"); - return AVERROR(EINVAL); + return AVERROR(ENOMEM); } frame->data[plane] = frame->buf[plane]->data; @@ -142,7 +142,7 @@ static int davs2_decode_frame(AVCodecContext *avctx, void *data, if (ret == DAVS2_ERROR) { av_log(avctx, AV_LOG_ERROR, "Decoder error: can't read packet\n"); - return AVERROR(EINVAL); + return AVERROR_EXTERNAL; } ret = davs2_decoder_recv_frame(cad->decoder, &cad->headerset, &cad->out_frame);