This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new 254124f869 avcodec/mjpegdec: fix some error return codes
254124f869 is described below
commit 254124f8699ab9225e0ad6119e06980e752ac836
Author: Ramiro Polla <[email protected]>
AuthorDate: Fri Sep 12 12:04:23 2025 +0200
Commit: Ramiro Polla <[email protected]>
CommitDate: Mon Dec 29 17:22:34 2025 +0100
avcodec/mjpegdec: fix some error return codes
---
libavcodec/mjpegdec.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 05150e982c..9b7afc96e8 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -210,7 +210,7 @@ int ff_mjpeg_decode_dqt(MJpegDecodeContext *s)
}
index = get_bits(&s->gb, 4);
if (index >= 4)
- return -1;
+ return AVERROR_INVALIDDATA;
av_log(s->avctx, AV_LOG_DEBUG, "index=%d\n", index);
/* read quant table */
for (i = 0; i < 64; i++) {
@@ -326,7 +326,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
if(s->lossless && s->avctx->lowres){
av_log(s->avctx, AV_LOG_ERROR, "lowres is not possible with lossless
jpeg\n");
- return -1;
+ return AVERROR(ENOSYS);
}
height = get_bits(&s->gb, 16);
@@ -349,7 +349,7 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
nb_components = get_bits(&s->gb, 8);
if (nb_components <= 0 ||
nb_components > MAX_COMPONENTS)
- return -1;
+ return AVERROR_INVALIDDATA;
if (s->interlaced && (s->bottom_field == !s->interlace_polarity)) {
if (nb_components != s->nb_components) {
av_log(s->avctx, AV_LOG_ERROR,
@@ -757,8 +757,9 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
}
av_frame_unref(s->picture_ptr);
- if (ff_get_buffer(s->avctx, s->picture_ptr, AV_GET_BUFFER_FLAG_REF) <
0)
- return -1;
+ ret = ff_get_buffer(s->avctx, s->picture_ptr, AV_GET_BUFFER_FLAG_REF);
+ if (ret < 0)
+ return ret;
s->picture_ptr->pict_type = AV_PICTURE_TYPE_I;
s->picture_ptr->flags |= AV_FRAME_FLAG_KEY;
s->got_picture = 1;
@@ -1677,7 +1678,7 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const
uint8_t *mb_bitmask,
if (!s->got_picture) {
av_log(s->avctx, AV_LOG_WARNING,
"Can not process SOS before SOF, skipping\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
/* XXX: verify len field validity */
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
