highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mxfenc: Remove AVERROR²

Browse Source 
Reviewed-by: James Almer <jamrial@gmail.com>
Reviewed-by: Tomas Härdin <git@haerdin.se>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2024-01-23 02:24:07 +01:00
parent 792c713504
commit 88a9142cac
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/mxfenc.c
View File

@@ -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);