From 4818ea69d2dab5e96e7c2c078d804a260d5efcbd Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Wed, 5 May 2021 21:27:21 +0200 Subject: [PATCH] avcodec/vp9: Inline function with only one caller into it The split into vp9_decode_init() and init_frames() is a remnant of using init_thread_copy() for frame-threading; the latter has been removed, so there is no reason for init_frames() not be part of vp9_decode_init(). Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index fd0e0dc54f..783f446125 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -1790,26 +1790,6 @@ static void vp9_decode_flush(AVCodecContext *avctx) ff_thread_release_buffer(avctx, &s->s.refs[i]); } -static int init_frames(AVCodecContext *avctx) -{ - VP9Context *s = avctx->priv_data; - int i; - - for (i = 0; i < 3; i++) { - s->s.frames[i].tf.f = av_frame_alloc(); - if (!s->s.frames[i].tf.f) - return AVERROR(ENOMEM); - } - for (i = 0; i < 8; i++) { - s->s.refs[i].f = av_frame_alloc(); - s->next_refs[i].f = av_frame_alloc(); - if (!s->s.refs[i].f || !s->next_refs[i].f) - return AVERROR(ENOMEM); - } - - return 0; -} - static av_cold int vp9_decode_init(AVCodecContext *avctx) { VP9Context *s = avctx->priv_data; @@ -1817,7 +1797,18 @@ static av_cold int vp9_decode_init(AVCodecContext *avctx) s->last_bpp = 0; s->s.h.filter.sharpness = -1; - return init_frames(avctx); + for (int i = 0; i < 3; i++) { + s->s.frames[i].tf.f = av_frame_alloc(); + if (!s->s.frames[i].tf.f) + return AVERROR(ENOMEM); + } + for (int i = 0; i < 8; i++) { + s->s.refs[i].f = av_frame_alloc(); + s->next_refs[i].f = av_frame_alloc(); + if (!s->s.refs[i].f || !s->next_refs[i].f) + return AVERROR(ENOMEM); + } + return 0; } #if HAVE_THREADS