From patchwork Mon Nov 30 00:54:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24190 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 9EBAC44AA5D for ; Mon, 30 Nov 2020 03:01:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8DD8568A0D3; Mon, 30 Nov 2020 02:56:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0A6A6689BE0 for ; Mon, 30 Nov 2020 02:56:00 +0200 (EET) Received: by mail-ej1-f54.google.com with SMTP id s13so2672387ejr.1 for ; Sun, 29 Nov 2020 16:56:00 -0800 (PST) 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:reply-to :mime-version:content-transfer-encoding; bh=/eP35La3ULdf7K/TbXzURizNx0lWPmjQ0U7+heau6F0=; b=pveeYRUAisIVqnfMb8SuCIO8oMrC0v1FjD1K/ZfNxiZ3Vadm74+xQrjkxb/oxMrv70 MPJRk9SxhhCfoTLqcfVXDbG9rBu8+y18QKJmAyafx54x34CYrK2rCVf47971MOcbWNPW Sn8GEP+rFNi99jGG7/W6W3yHM4KNdNZLMZknkd0AvYRs/AX3vFzWfV4R3xhuy82zQ+Py WYeO7TLhsdtygjxuYw2JkUmawpBOV5kRkuONmTZVObt8e+zUl5chncdkYbF9rfDjobi7 pnAjkUcSYYq8TYP/FKHIWeHniZfdwntNOQOetE2z3diOrE2BkxzgXzcj1FvzwRZxgkF6 6ysA== 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:reply-to:mime-version:content-transfer-encoding; bh=/eP35La3ULdf7K/TbXzURizNx0lWPmjQ0U7+heau6F0=; b=RNMihQ/ItKi4Tw68YbO55uccCBighktKSFj61PKfsvTW2JwY17TWUeC34nydc/rbAj fVkF5qifZBkpCyrHwWVBB1ZmnRFlJIb8DTlSp+RtHqH8XjxMLdAONRn8tEs2xg2CLhRD dQ+j8tFoeGUk072maaO6dfEO5ABEmnYOLM+bTgVhtWFnanCsemDD4CoRDIxJVshS7cTs dywuxgi53lr3mOn3Jf3931ubC5/HdHW5gSooEyX0ysJuVRUC5O3IIBpKLaqQR2whz2Vp uNStC+L/VnBA/gFlvlM1tpdHAWadPPA8pLkqGXpypgn1YVQNFZKs9U2FI5b5NW/YAnNc Vobg== X-Gm-Message-State: AOAM533DY9yo5/LJ4hTNxRVQ+dSV3NMutMzIBww2XmJ16h612YquZsg/ rcgy8xC/tbRVcQlSSNvG2M5CgJg5vVxB7A== X-Google-Smtp-Source: ABdhPJzSOv+vuXEQ5z8Vb+ewL2jZ/2D0DTmz47840y+jRuu68SWs6V3ATxVFeI2chs1GVSloM6wVLA== X-Received: by 2002:a17:906:3e02:: with SMTP id k2mr7347375eji.92.1606697760087; Sun, 29 Nov 2020 16:56:00 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id b20sm3354993eja.30.2020.11.29.16.55.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Nov 2020 16:55:59 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Nov 2020 01:54:30 +0100 Message-Id: <20201130005454.110441-38-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> References: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 110/134] avcodec/flashsv: Return error if initializing zlib fails 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/flashsv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index f55cb0feeb..59de1820be 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -126,7 +126,7 @@ static av_cold int flashsv_decode_init(AVCodecContext *avctx) zret = inflateInit(&s->zstream); if (zret != Z_OK) { av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret); - return 1; + return AVERROR_EXTERNAL; } avctx->pix_fmt = AV_PIX_FMT_BGR24;