[vlc-commits] vout_wrapper: remove constant parameter
Rémi Denis-Courmont
git at videolan.org
Sat Jan 26 19:51:08 CET 2019
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan 26 11:26:10 2019 +0200| [bf977ba6cf81913c8afaed36ae50e6dd0d8f26f7] | committer: Rémi Denis-Courmont
vout_wrapper: remove constant parameter
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bf977ba6cf81913c8afaed36ae50e6dd0d8f26f7
---
src/video_output/video_output.c | 2 +-
src/video_output/vout_internal.h | 2 +-
src/video_output/vout_wrapper.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index db45547d66..c391f985c8 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1619,7 +1619,7 @@ static void ThreadStop(vout_thread_t *vout)
if (vout->p->display) {
if (vout->p->decoder_pool)
ThreadFlush(vout, true, INT64_MAX);
- vout_CloseWrapper(vout, NULL);
+ vout_CloseWrapper(vout);
}
/* Destroy the video filters */
diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index 512318fcdb..1d60113f41 100644
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -206,7 +206,7 @@ void vout_IntfReinit( vout_thread_t * );
/* */
int vout_OpenWrapper(vout_thread_t *, const char *,
const vout_display_cfg_t *);
-void vout_CloseWrapper(vout_thread_t *, vout_display_cfg_t *);
+void vout_CloseWrapper(vout_thread_t *);
/* */
int spu_ProcessMouse(spu_t *, const vlc_mouse_t *, const video_format_t *);
diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c
index b1e291bde3..e9c0a2c120 100644
--- a/src/video_output/vout_wrapper.c
+++ b/src/video_output/vout_wrapper.c
@@ -160,7 +160,7 @@ error:
/*****************************************************************************
*
*****************************************************************************/
-void vout_CloseWrapper(vout_thread_t *vout, vout_display_cfg_t *cfg)
+void vout_CloseWrapper(vout_thread_t *vout)
{
vout_thread_sys_t *sys = vout->p;
@@ -176,7 +176,7 @@ void vout_CloseWrapper(vout_thread_t *vout, vout_display_cfg_t *cfg)
#endif
sys->decoder_pool = NULL; /* FIXME remove */
- vout_DeleteDisplay(sys->display, cfg);
+ vout_display_Delete(sys->display);
}
#ifdef _WIN32
More information about the vlc-commits
mailing list