@@ -819,19 +819,13 @@ static av_cold int av1_decode_init(AVCodecContext *avctx)
for (int i = 0; i < FF_ARRAY_ELEMS(s->ref); i++) {
s->ref[i].f = av_frame_alloc();
- if (!s->ref[i].f) {
- av_log(avctx, AV_LOG_ERROR,
- "Failed to allocate reference frame buffer %d.\n", i);
+ if (!s->ref[i].f)
return AVERROR(ENOMEM);
- }
}
s->cur_frame.f = av_frame_alloc();
- if (!s->cur_frame.f) {
- av_log(avctx, AV_LOG_ERROR,
- "Failed to allocate current frame buffer.\n");
+ if (!s->cur_frame.f)
return AVERROR(ENOMEM);
- }
ret = ff_cbs_init(&s->cbc, AV_CODEC_ID_AV1, avctx);
if (ret < 0)
@@ -75,19 +75,13 @@ static int vaapi_av1_decode_init(AVCodecContext *avctx)
VAAPIAV1DecContext *ctx = avctx->internal->hwaccel_priv_data;
ctx->tmp_frame = av_frame_alloc();
- if (!ctx->tmp_frame) {
- av_log(avctx, AV_LOG_ERROR,
- "Failed to allocate frame.\n");
+ if (!ctx->tmp_frame)
return AVERROR(ENOMEM);
- }
for (int i = 0; i < FF_ARRAY_ELEMS(ctx->ref_tab); i++) {
ctx->ref_tab[i].frame = av_frame_alloc();
- if (!ctx->ref_tab[i].frame) {
- av_log(avctx, AV_LOG_ERROR,
- "Failed to allocate reference table frame %d.\n", i);
+ if (!ctx->ref_tab[i].frame)
return AVERROR(ENOMEM);
- }
ctx->ref_tab[i].valid = 0;
}
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/av1dec.c | 10 ++-------- libavcodec/vaapi_av1.c | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-)