[vlc-commits] dxva: remove useless parameter

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep 27 14:21:24 2015 +0300| [978dedc520506167b500c9c68afe045cb9d318d7] | committer: Rémi Denis-Courmont

dxva: remove useless parameter

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=978dedc520506167b500c9c68afe045cb9d318d7
---

 modules/codec/avcodec/d3d11va.c    |    2 +-
 modules/codec/avcodec/directx_va.c |    3 +--
 modules/codec/avcodec/directx_va.h |    2 +-
 modules/codec/avcodec/dxva2.c      |    2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c
index d00e634..0adc774 100644
--- a/modules/codec/avcodec/d3d11va.c
+++ b/modules/codec/avcodec/d3d11va.c
@@ -147,7 +147,7 @@ static picture_t *DxAllocPicture(vlc_va_t *, const video_format_t *, unsigned in
 static int Setup(vlc_va_t *va, AVCodecContext *avctx, vlc_fourcc_t *chroma)
 {
     vlc_va_sys_t *sys = va->sys;
-    if (directx_va_Setup(va, &sys->dx_sys, avctx, chroma)!=VLC_SUCCESS)
+    if (directx_va_Setup(va, &sys->dx_sys, avctx)!=VLC_SUCCESS)
         return VLC_EGENERIC;
 
     avctx->hwaccel_context = &sys->hw;
diff --git a/modules/codec/avcodec/directx_va.c b/modules/codec/avcodec/directx_va.c
index 034a572..c8df0ec 100644
--- a/modules/codec/avcodec/directx_va.c
+++ b/modules/codec/avcodec/directx_va.c
@@ -252,7 +252,7 @@ static const directx_va_mode_t *FindDxvaMode(const GUID *guid)
 }
 
 /* */
-int directx_va_Setup(vlc_va_t *va, directx_sys_t *dx_sys, AVCodecContext *avctx, vlc_fourcc_t *chroma)
+int directx_va_Setup(vlc_va_t *va, directx_sys_t *dx_sys, AVCodecContext *avctx)
 {
     int surface_alignment = 16;
     int surface_count = 4;
@@ -265,7 +265,6 @@ int directx_va_Setup(vlc_va_t *va, directx_sys_t *dx_sys, AVCodecContext *avctx,
     DestroyVideoDecoder(va, dx_sys);
 
     avctx->hwaccel_context = NULL;
-    *chroma = 0;
     if (avctx->coded_width <= 0 || avctx->coded_height <= 0)
         return VLC_EGENERIC;
 
diff --git a/modules/codec/avcodec/directx_va.h b/modules/codec/avcodec/directx_va.h
index 7559be2..c3718a3 100644
--- a/modules/codec/avcodec/directx_va.h
+++ b/modules/codec/avcodec/directx_va.h
@@ -136,7 +136,7 @@ typedef struct
 
 int directx_va_Open(vlc_va_t *, directx_sys_t *, AVCodecContext *ctx, const es_format_t *fmt, bool b_dll);
 void directx_va_Close(vlc_va_t *, directx_sys_t *);
-int directx_va_Setup(vlc_va_t *, directx_sys_t *, AVCodecContext *avctx, vlc_fourcc_t *chroma);
+int directx_va_Setup(vlc_va_t *, directx_sys_t *, AVCodecContext *avctx);
 int directx_va_Get(vlc_va_t *, directx_sys_t *, picture_t *pic, uint8_t **data);
 void directx_va_Release(void *opaque, uint8_t *data);
 
diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index d92384b..c91055c 100644
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -207,7 +207,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)
 {
     vlc_va_sys_t *sys = va->sys;
-    if (directx_va_Setup(va, &sys->dx_sys, avctx, chroma)!=VLC_SUCCESS)
+    if (directx_va_Setup(va, &sys->dx_sys, avctx)!=VLC_SUCCESS)
         return VLC_EGENERIC;
 
     avctx->hwaccel_context = &sys->hw;