From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id AA8D340D34 for ; Tue, 23 Jan 2024 01:47:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5827368BDB2; Tue, 23 Jan 2024 03:47:42 +0200 (EET) 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_A?= =?utf-8?q?VERROR=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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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); -- 2.17.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".