diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-02-11 20:57:32 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2024-03-07 08:53:31 -0300 |
| commit | a0b9b96269b48298eddb927059cb4dfea6725167 (patch) | |
| tree | 67c9556521383e34969887400ef4260cd13ddfd7 | |
| parent | 51d6bee6671328d2b46d6ef70d1c3a3dfbb624c7 (diff) | |
| download | ffmpeg-a0b9b96269b48298eddb927059cb4dfea6725167.tar.gz | |
avutil/hwcontext_internal: Remove unused AVHWFramesInternal.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 AVHWFramesContext.hwctx.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -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 bb5e5f08a8..b9f13ccea9 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -241,7 +241,6 @@ static void hwframe_ctx_free(void *opaque, uint8_t *data) av_buffer_unref(&ctx->device_ref); av_freep(&ctx->hwctx); - av_freep(&ctx->internal->priv); av_freep(&ctx->internal); av_freep(&ctx); } @@ -261,12 +260,6 @@ AVBufferRef *av_hwframe_ctx_alloc(AVBufferRef *device_ref_in) if (!ctx->internal) goto fail; - if (hw_type->frames_priv_size) { - ctx->internal->priv = av_mallocz(hw_type->frames_priv_size); - if (!ctx->internal->priv) - goto fail; - } - if (hw_type->frames_hwctx_size) { ctx->hwctx = av_mallocz(hw_type->frames_hwctx_size); if (!ctx->hwctx) @@ -295,8 +288,6 @@ AVBufferRef *av_hwframe_ctx_alloc(AVBufferRef *device_ref_in) fail: av_buffer_unref(&device_ref); - 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 3745867283..1476def1d7 100644 --- a/libavutil/hwcontext_internal.h +++ b/libavutil/hwcontext_internal.h @@ -53,11 +53,6 @@ typedef struct HWContextType { * i.e. AVHWFramesContext.hwctx */ size_t frames_hwctx_size; - /** - * size of the private data, i.e. - * AVHWFramesInternal.priv - */ - size_t frames_priv_size; int (*device_create)(AVHWDeviceContext *ctx, const char *device, AVDictionary *opts, int flags); @@ -97,7 +92,6 @@ typedef struct HWContextType { struct AVHWFramesInternal { const HWContextType *hw_type; - void *priv; AVBufferPool *pool_internal; |