diff mbox series

[FFmpeg-devel] avutil/hwcontext: don't assume device_uninit is reentrant

Message ID tencent_6A8D1656CD2E20154DE5CF8AD51A274B3807@qq.com
State New
Headers show
Series [FFmpeg-devel] avutil/hwcontext: don't assume device_uninit is reentrant | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_aarch64_jetson success Make finished
andriy/make_fate_aarch64_jetson success Make fate finished
andriy/make_armv7_RPi4 success Make finished
andriy/make_fate_armv7_RPi4 success Make fate finished

Commit Message

Zhao Zhili March 18, 2022, 5:29 p.m. UTC 
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 mbox series

Patch

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;
 }