avformat/mxfenc: Remove AVERROR²

Reviewed-by: James Almer <jamrial@gmail.com>
Reviewed-by: Tomas Härdin <git@haerdin.se>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
release/7.0
Michael Niedermayer 1 year ago
parent 792c713504
commit 88a9142cac
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
  1. 6
      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);

Loading…
Cancel
Save