From patchwork Sat May 16 23:41:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: comex X-Patchwork-Id: 19718 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 512EE44B82A for ; Sun, 17 May 2020 03:11:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2BADF688395; Sun, 17 May 2020 03:11:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f193.google.com (mail-oi1-f193.google.com [209.85.167.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A91AE6808E9 for ; Sun, 17 May 2020 03:11:37 +0300 (EEST) Received: by mail-oi1-f193.google.com with SMTP id i22so5788658oik.10 for ; Sat, 16 May 2020 17:11:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LVpjxIqVyOL9Fjf1RSektFz2mexsOo9reEyTv8xkXXI=; b=tuiNADqiolGX8QSm7Yh43BFfTYD94fP5ADBBfpwjY118RJvuqKf6KOePnJyiY2UvJk mbP0bAEhLSa1sJPlNVlpHV/pB0kJWvs/Isffh6dqnF8VEvApUZS+iXFmxRBBvQEAuPfF 8YyslnVfxtZ3c5HHq2PZkdutTtk9tdj4wG7m8Gqkav+2/he/DzDT5P5UlyssD/A80wjz oAFA+LOJJkiAEqK6NCauGuj2Akf4l+RnbKiNbPA2BDzB1FT5krlUci5Lqo9QYUZ2AmuT MnHOT9HS/cyLXUHfxSpSGIM6gHH1cSuCdFRCPV22M3csnm7RW4KOV1LVqpdc/quOX23Y i4FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LVpjxIqVyOL9Fjf1RSektFz2mexsOo9reEyTv8xkXXI=; b=jJzmTkNkf1eI4bwS4wjsl88rVvHJHgdffAt8BQape0WtZLyrmhaycBCnxme82zEYnr TFNFMqY+nR9CRpJwzvf2Y7ITc3Yw2YnoacHbXZD9zZR4otDm7OhK8hRmZ7foamQaENvV fb2B6qCzmJXHe9ehm2sFe4BKFsOzx7XpT+u1rAwA1GfHUx81BnjWncLWNGf8TqaDWGR8 uyL1oUUBZ0COSV9ED32Rgl/ehFmGbE3zgLpUGeGIA2CrwWHEQbMeJE4OtUrWmQJeCeGu Z1G88L3gwHw4J5vzryHLvnTqJ3SOENBazoDJcYOz+N0T+ps81u54xiHmj5QMXizkGSsZ EPiA== X-Gm-Message-State: AOAM533EfaCo7DmqBWFDhqo0+hglx+6E63Cz6U7IpRG1TuzNDzLoYHRQ LOIn1TxzVbBvDn7agDktaGSm312wQIo= X-Google-Smtp-Source: ABdhPJw5QSpVMVqCz21tb8wWe2yDls9QB7OrNIWK5CRSqdpWb0J2tjCoUCCuoM+R9U+CH/N46Esvuw== X-Received: by 2002:a17:90a:e2d7:: with SMTP id fr23mr11143514pjb.218.1589672523380; Sat, 16 May 2020 16:42:03 -0700 (PDT) Received: from localhost ([2601:647:5000:47cf:58f4:485f:f601:291e]) by smtp.gmail.com with ESMTPSA id l10sm5127109pfd.70.2020.05.16.16.42.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 16 May 2020 16:42:02 -0700 (PDT) From: comex To: ffmpeg-devel@ffmpeg.org Date: Sat, 16 May 2020 16:41:49 -0700 Message-Id: <20200516234149.15000-1-comexk@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] decode: don't treat hwaccel->alloc_frame as always failing 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 Cc: comex Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes regression caused by a1133db30ef07896afd96f067e5c51531a4e85ab. On my Mac, the bug seems to make `mpv --hwdec=auto` always fail with: [ffmpeg/video] h264: get_buffer() failed [ffmpeg] Assertion src->f->buf[0] failed at src/libavcodec/h264_picture.c:70 Signed-off-by: comex --- libavcodec/decode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 48a61d5419..3fdfb551e3 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1889,7 +1889,8 @@ int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) if (hwaccel) { if (hwaccel->alloc_frame) { ret = hwaccel->alloc_frame(avctx, frame); - goto fail; + if (ret < 0) + goto fail; } } else avctx->sw_pix_fmt = avctx->pix_fmt;