diff options
| author | Andreas Rheinhardt <[email protected]> | 2024-02-11 17:50:24 +0100 |
|---|---|---|
| committer | James Almer <[email protected]> | 2024-03-07 08:53:31 -0300 |
| commit | 060277136d1ce028d9ae619196951e03d3bcd594 (patch) | |
| tree | af8f5f61594d25c7f39faa2682066ae07dd8f5d6 | |
| parent | 51f04054506fa1b9baaf79a6b37aac34d988b944 (diff) | |
avutil/hwcontext: Remove unused AVHWDeviceInternal.priv
It is no longer used by any hwcontext, as they all allocate
their private data together with their public data and access
it via AVHWDeviceContext.hwctx.
Signed-off-by: Andreas Rheinhardt <[email protected]>
| -rw-r--r-- | libavutil/hwcontext.c | 9 | ||||
| -rw-r--r-- | libavutil/hwcontext_internal.h | 6 |
2 files changed, 0 insertions, 15 deletions
diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index aa1329bf2b..3b72456dc9 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -139,7 +139,6 @@ static void hwdevice_ctx_free(void *opaque, uint8_t *data) av_buffer_unref(&ctx->internal->source_device); av_freep(&ctx->hwctx); - av_freep(&ctx->internal->priv); av_freep(&ctx->internal); av_freep(&ctx); } @@ -168,12 +167,6 @@ AVBufferRef *av_hwdevice_ctx_alloc(enum AVHWDeviceType type) if (!ctx->internal) goto fail; - if (hw_type->device_priv_size) { - ctx->internal->priv = av_mallocz(hw_type->device_priv_size); - if (!ctx->internal->priv) - goto fail; - } - if (hw_type->device_hwctx_size) { ctx->hwctx = av_mallocz(hw_type->device_hwctx_size); if (!ctx->hwctx) @@ -194,8 +187,6 @@ AVBufferRef *av_hwdevice_ctx_alloc(enum AVHWDeviceType type) return buf; fail: - if (ctx->internal) - av_freep(&ctx->internal->priv); av_freep(&ctx->internal); av_freep(&ctx->hwctx); av_freep(&ctx); diff --git a/libavutil/hwcontext_internal.h b/libavutil/hwcontext_internal.h index 4df516ee6a..374c6dde2f 100644 --- a/libavutil/hwcontext_internal.h +++ b/libavutil/hwcontext_internal.h @@ -41,11 +41,6 @@ typedef struct HWContextType { * i.e. AVHWDeviceContext.hwctx */ size_t device_hwctx_size; - /** - * size of the private data, i.e. - * AVHWDeviceInternal.priv - */ - size_t device_priv_size; /** * Size of the hardware-specific device configuration. @@ -102,7 +97,6 @@ typedef struct HWContextType { struct AVHWDeviceInternal { const HWContextType *hw_type; - void *priv; /** * For a derived device, a reference to the original device |