From patchwork Tue Feb 2 17:00:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nyanmisaka X-Patchwork-Id: 25349 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 872A7449222 for ; Tue, 2 Feb 2021 19:25:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6579F688074; Tue, 2 Feb 2021 19:25:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C1176804AB for ; Tue, 2 Feb 2021 19:25:26 +0200 (EET) Received: by mail-oi1-f181.google.com with SMTP id m13so23531736oig.8 for ; Tue, 02 Feb 2021 09:25:26 -0800 (PST) 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=Pxqn48Qvh/VZ12YnTlEyz2zl0bRPPotA6chgEXtwjL0=; b=LwUO8EOj33zQn8KkoAWfVreAGV5zXGM4I8jPxlc+JPwnb2WxLzEPKJ14Nz1ILOPvhH yhL/zMnBQKyPYiX+Sy/aovdDq9UCbDLqYWXMDNcAfk2OWBhpal6J5EQ/PL6L/uRCuttM DSA6vN7ivhFLLkYP9sbGN8v4EcT67GTnyRYCtSD/ew3Odwxm0r+8+20Yqz8/Xe4PIBOJ DbLm0DBmSGEGOGID99JGdR3V8LXvHT9rXuTrM4koZnWKw7Z6OX49ZWh1F1V6AF+nzf4k xSrk27nOCd3m0j53ffaA2OqSYMnkZUjH4PoUIHHLmai0X3IFXJwuKgpZKFJ4w509Qi1o 1n9Q== 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=Pxqn48Qvh/VZ12YnTlEyz2zl0bRPPotA6chgEXtwjL0=; b=PoZS3E2u5X6uAXTzwd1SlTfFng+puj/8ZUsqBfAVPKDbG1a7ilrTvOQMiMp+Rk/7aC UisHt+kHs+erhn8yoNCiWprHhxfjCreqP0j8G7QLGYt4OizEtG+/WKRnrmmgxyqZJKV7 UwhOkrWhwx7EnPMa/2a5icg2IE/1ACJpCJAPBrWnzSUuoCdqApOZ+7K2vTGPFfvRVERm tV3gwBYnO0Jr50F0+FK+e9G9f7nLP1avySxNKUxbKcrc+LVWP1eynOiwkGbnXJa33ANI bPRp9t/Fe8pfNa4lTUmXH7uiURzmpUWSDaqCuOW5FJNFPqSDHoiF9jzkAKox3ZRRpl4K 6kFA== X-Gm-Message-State: AOAM531w//grXa+c++LzlNGgFfikTPABidRWcES+1c13zWbhpV9/mTsL N8foGi932Bb9qWJuZGmSW9dbTB2dG7lLgA== X-Google-Smtp-Source: ABdhPJxOxyKax8B/niW10ZT6V8CYhQlUF4SASppp/W9K055xGF9AABvrmcNrAThoc8npMKTXNn6ZMQ== X-Received: by 2002:a17:90a:470b:: with SMTP id h11mr5302771pjg.186.1612285237498; Tue, 02 Feb 2021 09:00:37 -0800 (PST) Received: from sitan-pc.RT-AC68U (ec2-54-179-127-10.ap-southeast-1.compute.amazonaws.com. [54.179.127.10]) by smtp.gmail.com with ESMTPSA id bt21sm2817665pjb.39.2021.02.02.09.00.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 09:00:36 -0800 (PST) From: nyanmisaka To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Feb 2021 01:00:12 +0800 Message-Id: <20210202170013.43469-1-nst799610810@gmail.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avfilter/overlay_cuda: fix framesync with embedded PGS subtitle 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: nyanmisaka Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: nyanmisaka --- libavfilter/vf_overlay_cuda.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_overlay_cuda.c b/libavfilter/vf_overlay_cuda.c index 2f0f860e50..f6ee43e929 100644 --- a/libavfilter/vf_overlay_cuda.c +++ b/libavfilter/vf_overlay_cuda.c @@ -157,9 +157,12 @@ static int overlay_cuda_blend(FFFrameSync *fs) if (ret < 0) return ret; - if (!input_main || !input_overlay) + if (!input_main) return AVERROR_BUG; + if (!input_overlay) + return ff_filter_frame(outlink, input_main); + ret = av_frame_make_writable(input_main); if (ret < 0) { av_frame_free(&input_main);