Commit 9d189412 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

avcodec: remove va parameter from hwaccel release callback

parent 534201c5
......@@ -471,12 +471,11 @@ static int Get(vlc_va_t *external, AVFrame *ff)
ff->opaque = surface;
return VLC_SUCCESS;
}
static void Release(vlc_va_t *external, AVFrame *ff)
static void Release(AVFrame *ff)
{
vlc_va_surface_t *surface = ff->opaque;
surface->refcount--;
(void) external;
}
static void Close(vlc_va_t *external)
{
......
......@@ -69,9 +69,8 @@ static int Lock(vlc_va_t *va, AVFrame *ff)
return VLC_SUCCESS;
}
static void Unlock(vlc_va_t *va, AVFrame *ff)
static void Unlock(AVFrame *ff)
{
(void) va;
assert((uintptr_t)ff->opaque == SURFACE_MAGIC);
}
......
......@@ -38,7 +38,7 @@ struct vlc_va_t {
int (*setup)(vlc_va_t *, void **hw, vlc_fourcc_t *output,
int width, int height);
int (*get)(vlc_va_t *, AVFrame *frame);
void (*release)(vlc_va_t *, AVFrame *frame);
void (*release)(AVFrame *frame);
int (*extract)(vlc_va_t *, picture_t *dst, AVFrame *src);
};
......@@ -94,7 +94,7 @@ static inline int vlc_va_Get(vlc_va_t *va, AVFrame *frame)
*/
static inline void vlc_va_Release(vlc_va_t *va, AVFrame *frame)
{
va->release(va, frame);
va->release(frame);
}
/**
......
......@@ -518,7 +518,7 @@ static int Get( vlc_va_t *va, AVFrame *p_ff )
return VLC_SUCCESS;
}
static void Release( vlc_va_t *va, AVFrame *p_ff )
static void Release( AVFrame *p_ff )
{
vlc_va_surface_t *p_surface = p_ff->opaque;
......
......@@ -254,9 +254,8 @@ static int Extract( vlc_va_t *external, picture_t *p_picture, AVFrame *p_ff )
return VLC_SUCCESS;
}
static void Release( vlc_va_t *external, AVFrame *p_ff )
static void Release( AVFrame *p_ff )
{
VLC_UNUSED( external );
CVPixelBufferRef cv_buffer = ( CVPixelBufferRef )p_ff->data[3];
if ( cv_buffer )
......
......@@ -91,14 +91,12 @@ static int Lock(vlc_va_t *va, AVFrame *ff)
return VLC_SUCCESS;
}
static void Unlock(vlc_va_t *va, AVFrame *ff)
static void Unlock(AVFrame *ff)
{
vlc_vdp_video_field_t *field = ff->opaque;
assert(field != NULL);
field->destroy(field);
(void) va;
}
static int Copy(vlc_va_t *va, picture_t *pic, AVFrame *ff)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment