From patchwork Tue Sep 15 07:39:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22414 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 8DFB044A8AA for ; Tue, 15 Sep 2020 10:48:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 730B168BCBF; Tue, 15 Sep 2020 10:48:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCA7768BCBC for ; Tue, 15 Sep 2020 10:48:02 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id b79so2373529wmb.4 for ; Tue, 15 Sep 2020 00:48:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JUrTEIDz2KcNdCEnKzfNTgVxmdmuc3JJpzF0DOIXnUc=; b=VtKf6v392EcLMiVxxtVtq/wlJAGuGc8KYo5cS45O8CP58FNAqQe70NhwAaN/fZkTK7 Prlp7yGxaAcOOV2w/PeXN4h9EfoIn7E0GfrVq3FifcjhHOoes6srJvA8mTtC68FHiXPz c2OT2O6QBDNOZ2qrV3sFgs7h0w991q5BTfVNmqKoOt/WabBw9CbiilYZRuDmmEB50yXG OjmO6r2sY2iAz2MXOgp0sMyJ5q5Su6By7ZfLfcNNK3IouW+da9Y+cbgn2cLfPQtOHKYq WPrvLieDkh94pQZfnSEPs3e+95WQcd0gOJG+CZFi7fZBlFnepI9e7I3ZKXbrIm+J9nvL diyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JUrTEIDz2KcNdCEnKzfNTgVxmdmuc3JJpzF0DOIXnUc=; b=hEkzZBtFqEouCTYckZFLyBk7Acfpi5Sn044OWxx4yvIGpHYFNNlm4pVsLPizI2N1p2 M4QQUvz0UDr5+kSkFVW0v+7vZ4TmeWFn620pA5cWem3PC0cr+E+U34vjfc+dqJA5cDgx Yl80eDtFOeMGtv/AgG/Ghr0qANSkfICYXRInfyy5hyJgaMxK0EnDM4/sff10LrmUiRNM sv+3k1pBqNJgWBYBOiYsieSeM4uWIoQRnPMJTSmZURNNPN3rzKFvR6JVtnpwqKXMIDey sPXJpO+jUIcWZRm8TeoGhzHTgjEqky3O7GyAWLFNBi0SZHtOsi+eFxqzBF597/Db5ZJA aYtA== X-Gm-Message-State: AOAM530+eZY6+xKzMAJUCQQUYOC45VHF2dzGNq//bxvpZBRDTXDUeRfV M4Yoh+HRz9pWLxEYHVxdzP6oJGtxQSE= X-Google-Smtp-Source: ABdhPJyhngGGGmHyyDN0gCdX+1tZ9oK48F2wo7mQ+jWHIWDbXMMbU1gOAHnD1HOMOvmMcMKr7Wbtog== X-Received: by 2002:a1c:bcd4:: with SMTP id m203mr3193427wmf.75.1600155631476; Tue, 15 Sep 2020 00:40:31 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id d23sm6112125wmb.6.2020.09.15.00.40.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 00:40:30 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Sep 2020 09:39:35 +0200 Message-Id: <20200915074000.102622-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> References: <20200915074000.102622-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/30] avcodec/flashsv2enc: Return better error codes 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/flashsv2enc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavcodec/flashsv2enc.c b/libavcodec/flashsv2enc.c index 851abdc822..6603d0ded1 100644 --- a/libavcodec/flashsv2enc.c +++ b/libavcodec/flashsv2enc.c @@ -177,6 +177,7 @@ static void reset_stats(FlashSV2Context * s) static av_cold int flashsv2_encode_init(AVCodecContext * avctx) { FlashSV2Context *s = avctx->priv_data; + int ret; s->avctx = avctx; @@ -186,23 +187,23 @@ static av_cold int flashsv2_encode_init(AVCodecContext * avctx) if (s->comp < 0 || s->comp > 9) { av_log(avctx, AV_LOG_ERROR, "Compression level should be 0-9, not %d\n", s->comp); - return -1; + return AVERROR(EINVAL); } if ((avctx->width > 4095) || (avctx->height > 4095)) { av_log(avctx, AV_LOG_ERROR, "Input dimensions too large, input must be max 4095x4095 !\n"); - return -1; + return AVERROR(EINVAL); } if ((avctx->width < 16) || (avctx->height < 16)) { av_log(avctx, AV_LOG_ERROR, "Input dimensions too small, input must be at least 16x16 !\n"); - return -1; + return AVERROR(EINVAL); } - if (av_image_check_size(avctx->width, avctx->height, 0, avctx) < 0) - return -1; + if ((ret = av_image_check_size(avctx->width, avctx->height, 0, avctx)) < 0) + return ret; s->last_key_frame = 0;