From d3b29612009b65a83e626ef8800abc244df80f97 Mon Sep 17 00:00:00 2001 From: Limin Wang Date: Tue, 2 Jun 2020 23:36:54 +0800 Subject: avcodec/mpegvideo: simplify check for av_frame_alloc Signed-off-by: Limin Wang --- libavcodec/mpegvideo.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'libavcodec/mpegvideo.c') diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index eb73198b75..d3327e47cc 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -941,17 +941,10 @@ av_cold int ff_mpv_common_init(MpegEncContext *s) if (!s->picture[i].f) goto fail_nomem; } - s->next_picture.f = av_frame_alloc(); - if (!s->next_picture.f) - goto fail_nomem; - s->last_picture.f = av_frame_alloc(); - if (!s->last_picture.f) - goto fail_nomem; - s->current_picture.f = av_frame_alloc(); - if (!s->current_picture.f) - goto fail_nomem; - s->new_picture.f = av_frame_alloc(); - if (!s->new_picture.f) + if (!(s->next_picture.f = av_frame_alloc()) || + !(s->last_picture.f = av_frame_alloc()) || + !(s->current_picture.f = av_frame_alloc()) || + !(s->new_picture.f = av_frame_alloc())) goto fail_nomem; if ((ret = init_context_frame(s))) -- cgit v1.2.3