avcodec/mpegvideo: simplify check for av_frame_alloc

Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
5 years ago · d3b2961200
parent 44863b2c2d
commit d3b2961200
1 changed files with 4 additions and 11 deletions
--- 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)))