From: Michael Niedermayer <michael@niedermayer.cc> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Subject: [FFmpeg-devel] [PATCH] avformat/mxfenc: Remove AVERROR² Date: Tue, 23 Jan 2024 02:47:33 +0100 Message-ID: <20240123014733.30675-1-michael@niedermayer.cc> (raw) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- 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".
next reply other threads:[~2024-01-23 1:47 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-01-23 1:47 Michael Niedermayer [this message] 2024-01-23 11:46 ` James Almer 2024-01-23 12:56 ` Tomas Härdin 2024-01-23 20:04 ` Michael Niedermayer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240123014733.30675-1-michael@niedermayer.cc \ --to=michael@niedermayer.cc \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git