From 8b221d3b92a808c605282dffc1b991f1f55e8b34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Sun, 27 Sep 2015 15:52:27 +0300
Subject: [PATCH] va: remove unused parameter
---
modules/codec/avcodec/d3d11va.c | 2 +-
modules/codec/avcodec/dxva2.c | 2 +-
modules/codec/avcodec/va.h | 6 ++----
modules/codec/avcodec/vaapi.c | 2 +-
modules/codec/avcodec/vda.c | 4 ++--
modules/codec/avcodec/video.c | 2 +-
modules/hw/vdpau/avcodec.c | 2 +-
7 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c
index 9ad378aaaf7a..7cda195b05be 100644
--- a/modules/codec/avcodec/d3d11va.c
+++ b/modules/codec/avcodec/d3d11va.c
@@ -144,7 +144,7 @@ static void SetupAVCodecContext(vlc_va_t *);
static picture_t *DxAllocPicture(vlc_va_t *, const video_format_t *, unsigned index);
/* */
-static int Setup(vlc_va_t *va, AVCodecContext *avctx, vlc_fourcc_t *chroma)
+static int Setup(vlc_va_t *va, vlc_fourcc_t *chroma)
{
vlc_va_sys_t *sys = va->sys;
diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index dad28ac84616..b626fd4f4ee0 100644
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -204,7 +204,7 @@ static filter_t *CreateFilter( vlc_object_t *p_this, const es_format_t *p_fmt_in
}
/* */
-static int Setup(vlc_va_t *va, AVCodecContext *avctx, vlc_fourcc_t *chroma)
+static int Setup(vlc_va_t *va, vlc_fourcc_t *chroma)
{
vlc_va_sys_t *sys = va->sys;
diff --git a/modules/codec/avcodec/va.h b/modules/codec/avcodec/va.h
index 5c4b11d7239a..e08a39b96242 100644
--- a/modules/codec/avcodec/va.h
+++ b/modules/codec/avcodec/va.h
@@ -36,7 +36,7 @@ struct vlc_va_t {
module_t *module;
const char *description;
- int (*setup)(vlc_va_t *, AVCodecContext *, vlc_fourcc_t *output);
+ int (*setup)(vlc_va_t *, vlc_fourcc_t *output);
int (*get)(vlc_va_t *, picture_t *pic, uint8_t **data);
void (*release)(void *pic, uint8_t *surface);
int (*extract)(vlc_va_t *, picture_t *pic, uint8_t *data);
@@ -63,12 +63,10 @@ vlc_va_t *vlc_va_New(vlc_object_t *obj, AVCodecContext *,
/**
* Initializes the acceleration video decoding back-end for libavcodec.
- * @param avctx libavcodec codec context
* @param output pointer to video chroma output by the back-end [OUT]
* @return VLC_SUCCESS on success, otherwise an error code.
*/
-static inline int vlc_va_Setup(vlc_va_t *va, AVCodecContext *avctx,
- vlc_fourcc_t *output)
+static inline int vlc_va_Setup(vlc_va_t *va, vlc_fourcc_t *output)
{
return va->setup(va, avctx, output);
}
diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
index d21809d5fc3f..fa04a66bbc98 100644
--- a/modules/codec/avcodec/vaapi.c
+++ b/modules/codec/avcodec/vaapi.c
@@ -187,7 +187,7 @@ static void Release( void *opaque, uint8_t *data )
(void) data;
}
-static int Setup( vlc_va_t *va, AVCodecContext *avctx, vlc_fourcc_t *pi_chroma )
+static int Setup( vlc_va_t *va, vlc_fourcc_t *pi_chroma )
{
*pi_chroma = VLC_CODEC_YV12;
return VLC_SUCCESS;
diff --git a/modules/codec/avcodec/vda.c b/modules/codec/avcodec/vda.c
index 48843d380c16..2425844d2215 100644
--- a/modules/codec/avcodec/vda.c
+++ b/modules/codec/avcodec/vda.c
@@ -48,7 +48,7 @@
static int Open( vlc_va_t *, AVCodecContext *, enum PixelFormat,
const es_format_t *, picture_sys_t * );
static void Close( vlc_va_t * , AVCodecContext *);
-static int Setup( vlc_va_t *, AVCodecContext *, vlc_fourcc_t *);
+static int Setup( vlc_va_t *, vlc_fourcc_t *);
static int Get( vlc_va_t *, picture_t *, uint8_t ** );
static int Extract( vlc_va_t *, picture_t *, uint8_t * );
static void Release( void *opaque, uint8_t *data );
@@ -174,7 +174,7 @@ static void Close( vlc_va_t *va, AVCodecContext *avctx )
(void) va;
}
-static int Setup( vlc_va_t *va, AVCodecContext *avctx, vlc_fourcc_t *pi_chroma )
+static int Setup( vlc_va_t *va, vlc_fourcc_t *pi_chroma )
{
*pi_chroma = VLC_CODEC_I420;
diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 2eaa16f58de0..e3638e6a55c6 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -1134,7 +1134,7 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
if (va == NULL)
continue; /* Unsupported codec profile or such */
- if (vlc_va_Setup(va, p_context, &p_dec->fmt_out.video.i_chroma))
+ if (vlc_va_Setup(va, &p_dec->fmt_out.video.i_chroma))
{
msg_Err( p_dec, "acceleration setup failure" );
vlc_va_Delete(va, p_context);
diff --git a/modules/hw/vdpau/avcodec.c b/modules/hw/vdpau/avcodec.c
index f721befd252b..06e720935d58 100644
--- a/modules/hw/vdpau/avcodec.c
+++ b/modules/hw/vdpau/avcodec.c
@@ -140,7 +140,7 @@ static int Copy(vlc_va_t *va, picture_t *pic, uint8_t *data)
return VLC_SUCCESS;
}
-static int Setup(vlc_va_t *va, AVCodecContext *avctx, vlc_fourcc_t *chromap)
+static int Setup(vlc_va_t *va, vlc_fourcc_t *chromap)
{
vlc_va_sys_t *sys = va->sys;
--
GitLab