virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/svq3: Improve returned error codes

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-05-15 03:24:23 +02:00
parent 0468b866ca
commit cb54eca41a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/svq3.c
View File

@ -1225,7 +1225,7 @@ static av_cold int svq3_decode_extradata(AVCodecContext *avctx, SVQ3Context *s,
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"could not uncompress watermark logo\n"); "could not uncompress watermark logo\n");
av_free(buf); av_free(buf);
return -1; return AVERROR_EXTERNAL;
} }
s->watermark_key = av_bswap16(av_crc(av_crc_get_table(AV_CRC_16_CCITT), 0, buf, buf_len)); s->watermark_key = av_bswap16(av_crc(av_crc_get_table(AV_CRC_16_CCITT), 0, buf, buf_len));
@ -1403,8 +1403,9 @@ static int svq3_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
if (ret < 0) if (ret < 0)
return ret; return ret;
if (svq3_decode_slice_header(avctx)) ret = svq3_decode_slice_header(avctx);
return -1; if (ret < 0)
return ret;
if (avpkt->size < s->mb_width * s->mb_height / 8) if (avpkt->size < s->mb_width * s->mb_height / 8)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -1517,8 +1518,9 @@ static int svq3_decode_frame(AVCodecContext *avctx, AVFrame *rframe,
if (((get_bits_count(&s->gb_slice) & 7) == 0 || if (((get_bits_count(&s->gb_slice) & 7) == 0 ||
show_bits(&s->gb_slice, get_bits_left(&s->gb_slice) & 7) == 0)) { show_bits(&s->gb_slice, get_bits_left(&s->gb_slice) & 7) == 0)) {
if (svq3_decode_slice_header(avctx)) ret = svq3_decode_slice_header(avctx);
return -1; if (ret < 0)
return ret;
} }
if (s->slice_type != s->pict_type) { if (s->slice_type != s->pict_type) {
avpriv_request_sample(avctx, "non constant slice type"); avpriv_request_sample(avctx, "non constant slice type");