Commit 894545cb authored by Michael Niedermayer's avatar Michael Niedermayer Committed by Vittorio Giovara

mpegvideo: exit cleanly when ff_mpv_common_frame_size_change() fails

Signed-off-by: 's avatarVittorio Giovara <vittorio.giovara@gmail.com>
parent 7a38987f
...@@ -1436,8 +1436,8 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s) ...@@ -1436,8 +1436,8 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s)
s->mb_height = (s->height + 15) / 16; s->mb_height = (s->height + 15) / 16;
if ((s->width || s->height) && if ((s->width || s->height) &&
av_image_check_size(s->width, s->height, 0, s->avctx)) (err = av_image_check_size(s->width, s->height, 0, s->avctx)) < 0)
return AVERROR_INVALIDDATA; goto fail;
if ((err = init_context_frame(s))) if ((err = init_context_frame(s)))
goto fail; goto fail;
...@@ -1453,7 +1453,7 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s) ...@@ -1453,7 +1453,7 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s)
} }
for (i = 0; i < nb_slices; i++) { for (i = 0; i < nb_slices; i++) {
if (init_duplicate_context(s->thread_context[i]) < 0) if ((err = init_duplicate_context(s->thread_context[i])) < 0)
goto fail; goto fail;
s->thread_context[i]->start_mb_y = s->thread_context[i]->start_mb_y =
(s->mb_height * (i) + nb_slices / 2) / nb_slices; (s->mb_height * (i) + nb_slices / 2) / nb_slices;
......
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