virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

jpegls: return meaningful errors

Browse Source
This commit is contained in:
Luca Barbato 2013-05-17 12:36:06 +02:00
parent 2768f7e4fe
commit a5a0ef5e13
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/jpeglsdec.c
View File

@ -68,13 +68,13 @@ int ff_jpegls_decode_lse(MJpegDecodeContext *s)
case 2: case 2:
case 3: case 3:
av_log(s->avctx, AV_LOG_ERROR, "palette not supported\n"); av_log(s->avctx, AV_LOG_ERROR, "palette not supported\n");
return -1; return AVERROR(ENOSYS);
case 4: case 4:
av_log(s->avctx, AV_LOG_ERROR, "oversize image not supported\n"); av_log(s->avctx, AV_LOG_ERROR, "oversize image not supported\n");
return -1; return AVERROR(ENOSYS);
default: default:
av_log(s->avctx, AV_LOG_ERROR, "invalid id %d\n", id); av_log(s->avctx, AV_LOG_ERROR, "invalid id %d\n", id);
return -1; return AVERROR_INVALIDDATA;
} }
av_dlog(s->avctx, "ID=%i, T=%i,%i,%i\n", id, s->t1, s->t2, s->t3); av_dlog(s->avctx, "ID=%i, T=%i,%i,%i\n", id, s->t1, s->t2, s->t3);
@ -346,11 +346,10 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
cur += s->picture_ptr->linesize[0]; cur += s->picture_ptr->linesize[0];
} }
} else if (ilv == 2) { /* sample interleaving */ } else if (ilv == 2) { /* sample interleaving */
av_log(s->avctx, AV_LOG_ERROR, avpriv_report_missing_feature(s->avctx, "Sample interleaved images");
"Sample interleaved images are not supported.\n");
av_free(state); av_free(state);
av_free(zero); av_free(zero);
return -1; return AVERROR_PATCHWELCOME;
} }
if (shift) { /* we need to do point transform or normalize samples */ if (shift) { /* we need to do point transform or normalize samples */