Commit 712ef251 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

Avoid a null pointer dereference after oom on frame size change in mpegvideo.c.

Fixes ticket #2735.
parent f4aa8085
...@@ -1223,7 +1223,8 @@ int ff_MPV_common_frame_size_change(MpegEncContext *s) ...@@ -1223,7 +1223,8 @@ int ff_MPV_common_frame_size_change(MpegEncContext *s)
(s->mb_height * (i + 1) + nb_slices / 2) / nb_slices; (s->mb_height * (i + 1) + nb_slices / 2) / nb_slices;
} }
} else { } else {
if (init_duplicate_context(s) < 0) err = init_duplicate_context(s);
if (err < 0)
goto fail; goto fail;
s->start_mb_y = 0; s->start_mb_y = 0;
s->end_mb_y = s->mb_height; s->end_mb_y = s->mb_height;
......
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