diff options
Diffstat (limited to 'libavcodec/jvdec.c')
| -rw-r--r-- | libavcodec/jvdec.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c index 4337d5681e..b06e7cf2bf 100644 --- a/libavcodec/jvdec.c +++ b/libavcodec/jvdec.c @@ -163,13 +163,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, av_log(avctx, AV_LOG_ERROR, "video size %d invalid\n", video_size); return AVERROR_INVALIDDATA; } - if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) - return ret; if (video_type == 0 || video_type == 1) { GetBitContext gb; init_get_bits(&gb, buf, 8 * video_size); + if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) + return ret; + if (avctx->height/8 * (avctx->width/8) > 4 * video_size) { av_log(avctx, AV_LOG_ERROR, "Insufficient input data for dimensions\n"); return AVERROR_INVALIDDATA; @@ -184,6 +185,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, buf += video_size; } else if (video_type == 2) { int v = *buf++; + + av_frame_unref(s->frame); + if ((ret = ff_get_buffer(avctx, s->frame, AV_GET_BUFFER_FLAG_REF)) < 0) + return ret; + for (j = 0; j < avctx->height; j++) memset(s->frame->data[0] + j * s->frame->linesize[0], v, avctx->width); |