From patchwork Fri May 29 18:07:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 19973 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2BD64449F64 for ; Fri, 29 May 2020 21:08:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 075DA68AB98; Fri, 29 May 2020 21:08:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D094680A4B for ; Fri, 29 May 2020 21:07:56 +0300 (EEST) Received: by mail-qt1-f195.google.com with SMTP id w90so2666331qtd.8 for ; Fri, 29 May 2020 11:07:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=tfV/56CBnvCZRDwdJqfuSyBnn4avy69RvgCPC/EBxGc=; b=iFoqa3V+KTVUFWwxXofv4zSblPEqLjCLxaFjJu5cALhslDc0iDCsDcRdLwJNkGpCYd rfg1IZKyWEl0eUQa2p7jevmXIh3jzg7189CJFiXWnSnx707BZWFmEf3Ic6diMqK5blDw 3Y/pIDKilw7iSNNDElWjR1jjQqFz+W+Im+L+lhs8SeuYNS34NRVnD5O4IYvTRSqkG1BH GUa3ifYixgwa0Lh2KW78LfYMjugc5GSx70sif8tGJbVw27q1tDghxFXoUPzy8MI5Sz7x 40HxEUdcuevLJeM/7bcKdCC9//CmkAJcLl4kRoYs8aIc8poULPFWoL+Q9FMlL5wtLnQT PJIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=tfV/56CBnvCZRDwdJqfuSyBnn4avy69RvgCPC/EBxGc=; b=J+1tRovQ1N9i0/BEBWXI8lyTjrOaZbDdAf8kegVLuS54En/3M8HKvNxD7tkE1kyhg1 NATaqYYiXPWuFVhL+6YY4BZXBSdpBs5K3MLiWI8Zwh7yCOwhiZZjU4LDSjGb3qHTqrN7 9rFvLcnIV2PW/AqnOKsEABHr/6vmg4zfeOMk8xRuViPfQobeJaFrhMUXq2SVxCgoCnXj 1jMnmhk8bDEsB68Ps+tLLo3pnWjGQBccV7ELfVhIItew3F0WO57ZyTRXQwdwLhkEmGmR C6SgoxX7APYVOgwGGcP9bqv8qPgIlL+r+4OznkzBEQcfrAa/Uxs4TwPDyhFwR+HWWhNS rKUw== X-Gm-Message-State: AOAM5300i2wjgjUvhcUfc64dqU1rnJ5PhVxABabBxBXj/WZt+EMyWE/1 mHPu93mawK/MHO2TWUOQyFR3bcVZ X-Google-Smtp-Source: ABdhPJxMMj2kY4H6uvB0j+wRYIup5c+eQeWXZRFdUcnyOhVkAoV5o+JiWCogZaayH6HG4M6rIR7eWw== X-Received: by 2002:ac8:2979:: with SMTP id z54mr10432962qtz.14.1590775674788; Fri, 29 May 2020 11:07:54 -0700 (PDT) Received: from localhost.localdomain ([181.23.76.18]) by smtp.gmail.com with ESMTPSA id r14sm7584028qke.62.2020.05.29.11.07.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 May 2020 11:07:54 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 May 2020 15:07:41 -0300 Message-Id: <20200529180741.4680-1-jamrial@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/decode: actually propagate AVHWAccel.alloc_frame() return value X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Finishes fixing the regression introduced in a1133db30ef07896afd96f067e5c51531a4e85ab after the partial fix in b6d6597bef66531ec07c07a7125b88aee38fb220. Signed-off-by: James Almer --- libavcodec/decode.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index eed89a89a7..a4e50c0d03 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1911,10 +1911,12 @@ end: frame->height = avctx->height; } - return 0; fail: - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - av_frame_unref(frame); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + av_frame_unref(frame); + } + return ret; }