Commit df037fe1 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/smvjpegdec: assert that the pixel format that has been set by our decoder is valid

If we do check av_pix_fmt_desc_get() then we should fail and
not continue with an invalid pix_fmt
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent e0db4131
...@@ -164,7 +164,9 @@ static int smvjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_siz ...@@ -164,7 +164,9 @@ static int smvjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_siz
return AVERROR(EINVAL); return AVERROR(EINVAL);
desc = av_pix_fmt_desc_get(s->avctx->pix_fmt); desc = av_pix_fmt_desc_get(s->avctx->pix_fmt);
if (desc && mjpeg_data->height % (s->frames_per_jpeg << desc->log2_chroma_h)) { av_assert0(desc);
if (mjpeg_data->height % (s->frames_per_jpeg << desc->log2_chroma_h)) {
av_log(avctx, AV_LOG_ERROR, "Invalid height\n"); av_log(avctx, AV_LOG_ERROR, "Invalid height\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment