From patchwork Tue Jan 23 01:47:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 45731 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:120f:b0:199:de12:6fa6 with SMTP id v15csp343701pzf; Mon, 22 Jan 2024 17:47:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IFUZeHcuBx9t4YChFik5skUc58J1myJVf6EaSlLkz394sz36LKDZd5Ul/K4iTTp7mm+saqU X-Received: by 2002:a17:906:b213:b0:a30:984f:f310 with SMTP id p19-20020a170906b21300b00a30984ff310mr299188ejz.188.1705974467052; Mon, 22 Jan 2024 17:47:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705974467; cv=none; d=google.com; s=arc-20160816; b=p2hdTzk2Q3fxQ21ZkbhS5XoT9JuMU4hKYhOPtYhS4TdR8xN50NRjrNJOK3biI7ierd 06fniCzBXKCNbTjuy34qm7+JC3NjoOSZJezoTOeIe6hsX5XmnIcNQdi3XzBByXOk/IS7 0fjuHgm9RNv9cj03ysvcMR7wiGGDFofE/TARle4D0yFQJH7sZKw2xzCY5og4fHjo/TC0 5KVY+CAH+VLKqAE5ZPihTN/jz4ptHhrgMSdkWojvHAmQaOALzO342bngM4CFUBKt6J/B 0iAWTnAz1+tjU/2xcIcrFChS7IL7QvW8UeO0kUsEKdT0UJqbYmcOXA+ViOLtNcSINYAD B7zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=dW5cRB1iuRkViGDtEeOcLMgR6FR4rQd/goOPemHWcY0=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=yYLuPx+Bmp5H/BtqV/+COovUM3KtUD7S5/yhZtPaJd4ewTwhqlYdXQCAohFPCosAFy X1iY4WvyQLn3k7nGMTLbMM6Q2xYXeKJclwWOCt+4pR2N4tawJ4sZFCIFyKTVyF87WD9t 6zHO3KuhRV60WToCfHzfitYeg8/yiYBLYxkZioLzo4yCm0JaB2jtc+eQApic8cv73+RS 3O5sINT5ehxzP3MSlrbvGzr6vwee4i3TTz1YYOvgTHCIjr/u112tHutHmMqDjJu+PPpY ag2x3VGQDq3hPh+nNVOt7tRXhD0gX1+O4RYuZ0RcJjl3b7Is4GTg05SNHhhzajD7ViFM EiCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=kltuKKKO; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id kl6-20020a170907994600b00a30136c1e5csi2195394ejc.212.2024.01.22.17.47.46; Mon, 22 Jan 2024 17:47:47 -0800 (PST) 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=@niedermayer.cc header.s=gm1 header.b=kltuKKKO; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B3DA68CEE7; Tue, 23 Jan 2024 03:47:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E43A368AAAB for ; Tue, 23 Jan 2024 03:47:35 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 91CCC60002 for ; Tue, 23 Jan 2024 01:47:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1705974454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K2ZXoIwGyYpmHeMPEtEQ4O00s+pnZ+5x/vUQoO08F4E=; b=kltuKKKORE67n3m2FibzzNKscShZ88XgISrhlr+QH6LjFb66tNgyVy4stLM77K679gVDRy HkrYHrfSBVjmvqczedeRTS5rCNZN6Hg08/Ek4sn4umwz70z35LuDxoPB0dUuRx2jvRDk/k Hqv6sfm2z43vT93BjSFQFtlWZ7tq6y1AteUuXW3xWBUZrqX2R1+n90ySWrAQzVpgfe7TMr Pb89XYfHsyBypxd8HzuqnWq5tfbfqgpE+U+POH0tXA1ZXIfAbB6msDbZ/ZfYwt3v4pxaxN 2t5rhT434Ao+7aq+tEUPL+ob6wGYcEa4KUUcQUhESzGJL12CASPyUuOp/un19A== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 23 Jan 2024 02:47:33 +0100 Message-Id: <20240123014733.30675-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] =?utf-8?q?=5BPATCH=5D_avformat/mxfenc=3A_Remove_AVER?= =?utf-8?q?ROR=C2=B2?= X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QY33tiuZYSOe Signed-off-by: Michael Niedermayer --- libavformat/mxfenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 685c11b3a50..c67e8ff9609 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2656,13 +2656,13 @@ static int mxf_parse_jpeg2000_frame(AVFormatContext *s, AVStream *st, AVPacket * if (bytestream2_get_be16u(&g) != JPEG2000_SOC) { av_log(s, AV_LOG_ERROR, "Mandatory SOC marker is not present\n"); - return AVERROR(AVERROR_INVALIDDATA); + return AVERROR_INVALIDDATA; } /* Extract usefull size information from the SIZ marker */ if (bytestream2_get_be16u(&g) != JPEG2000_SIZ) { av_log(s, AV_LOG_ERROR, "Mandatory SIZ marker is not present\n"); - return AVERROR(AVERROR_INVALIDDATA); + return AVERROR_INVALIDDATA; } bytestream2_skip(&g, 2); // Skip Lsiz sc->j2k_info.j2k_cap = bytestream2_get_be16u(&g); @@ -2677,7 +2677,7 @@ static int mxf_parse_jpeg2000_frame(AVFormatContext *s, AVStream *st, AVPacket * j2k_ncomponents = bytestream2_get_be16u(&g); if (j2k_ncomponents != component_count) { av_log(s, AV_LOG_ERROR, "Incoherence about components image number.\n"); - return AVERROR(AVERROR_INVALIDDATA); + return AVERROR_INVALIDDATA; } bytestream2_get_bufferu(&g, sc->j2k_info.j2k_comp_desc, 3 * j2k_ncomponents);