From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 568CD4256B for ; Fri, 18 Mar 2022 17:29:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 521D368B0CD; Fri, 18 Mar 2022 19:29:37 +0200 (EET) Received: from out203-205-221-153.mail.qq.com (out203-205-221-153.mail.qq.com [203.205.221.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0EDB689EA6 for ; Fri, 18 Mar 2022 19:29:28 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1647624564; bh=HGiBt2d3ZyjeBl6hD8zjAoFLLacnf+DArfvO+LzrZ2E=; h=From:To:Cc:Subject:Date; b=FdZTW1T+s73ptZdeKZiU4i2mcrO/coh2apz6z1KSOvvm5yyTKvGJKr0HRGfJMdFWw BYNzSKsbY8fEbsrkb7T4U4QIMODbRp+3PcScF5OMIHx1urbMjHXJykH9CUdMOOKpkz 07PkQOXUxFOUpUCn0++SXYgLfL6bE82toXdGK7OU= Received: from ZHILIZHAO-MB2.tencent.com ([119.123.135.112]) by newxmesmtplogicsvrszc8.qq.com (NewEsmtp) with SMTP id 7570FA1D; Sat, 19 Mar 2022 01:29:23 +0800 X-QQ-mid: xmsmtpt1647624563tndwh63om Message-ID: X-QQ-XMAILINFO: NJ/+omVLhVgaxPg0IMxeTmN7xGe8WWjuSaSAFWvqyVcx914I5+TYP7nbTk+rDj DIydIkV7tSoeRcoAWVlG3pWZMYcm2ypXI4CMR0C31Uiv5KZPnMJ1Wy52oW8cRCAPzflcfUlqenN5 iXnE5zurRAGz+oUEPKsrzX4VvIra1lzOGGWqmjnlqsodYpdkk9ls9ssUyAk0WhEBVAJTr6TmTLHT TfQNQHGuik5dvZmyKaZlyYXEgNkQVYxE8CfCCDZdkn3BxWzV1N3159CZ2cRzP4KUwMf31hQqfR8W WEInPgU7m0oCAv0d+ixVcTEILM0Cn1Unpm666jKUvxVps1S9xFcIaFDA3nOKvTUofafPH094AYYE dFt8UGOkRk5LRi/qdOJstxfRV3SpfPCbtL0bTKCl4zYdQbrijLZ7zhvTPoY7W9lPypsocFZk5w0N MR+tAMZBkw2/XVSNcCXIF7iDoveMK/8nM1wAJ3vJJjDJ22f9gWtmLXHN4LEErHjMA1G2fjN8yOQV bdKLEcqiRD+KAo0QEVfv81LehJG42mDQheDzYKQ+LRvPvVJ+zHovuY5axTX+Vc2oKYX5O++eEIjt /mdPXA+R0QzJMUrKLan/Ybn3eAyH4qPyffiaLHuaKETeX1S65dVXhA4t9jWHHM9v3mLejg3zSVMk 7zlOLbAvjWPE27R0/MO+5yE9r1bldCwGt+YyXckdXCNm4ORI81cRAb//m/23AXg+xm2C9HinEiu7 B4Tb3KH8HbFjZJgyZBSGXpZkv9bO+GkAjRp6rehYfWdDERzIj3OheYewTUiRdYtZI1xBH7xu2qVH AS6NOUZIPx5r9x0PLovGZ2+shNxJusGmwhH1S3ycr/7ihNJc1O5SreNkZ1Jwzg6wuNCGPgc7wntw nIyQ42zVZGDEL2ful37hSJP3G/Ra66xg== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Mar 2022 01:29:20 +0800 X-OQ-MSGID: <20220318172920.72210-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutil/hwcontext: don't assume device_uninit is reentrant X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: device_uninit will be called by hwdevice_ctx_free. It's not a real issue now since all of the implementaions have reentrant uninit, but it was, e.g., f6d49a0. We can remove the restriction, and make the code more simple. --- libavutil/hwcontext.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index ab9ad3703e..8149f4e18b 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -201,18 +201,12 @@ fail: int av_hwdevice_ctx_init(AVBufferRef *ref) { AVHWDeviceContext *ctx = (AVHWDeviceContext*)ref->data; - int ret; + int ret = 0; if (ctx->internal->hw_type->device_init) { ret = ctx->internal->hw_type->device_init(ctx); - if (ret < 0) - goto fail; } - return 0; -fail: - if (ctx->internal->hw_type->device_uninit) - ctx->internal->hw_type->device_uninit(ctx); return ret; } -- 2.31.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".