[FFmpeg-cvslog] avcodec/mpegvideo: simplify check for av_frame_alloc
Limin Wang
git at videolan.org
Sat Jun 13 02:04:52 EEST 2020
ffmpeg | branch: master | Limin Wang <lance.lmwang at gmail.com> | Tue Jun 2 23:36:54 2020 +0800| [d3b29612009b65a83e626ef8800abc244df80f97] | committer: Limin Wang
avcodec/mpegvideo: simplify check for av_frame_alloc
Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d3b29612009b65a83e626ef8800abc244df80f97
---
libavcodec/mpegvideo.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
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)))
More information about the ffmpeg-cvslog
mailing list