[vlc-commits] caca: fix the Open/Close signatures
Steve Lhomme
git at videolan.org
Tue Jul 9 14:10:01 CEST 2019
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Jul 9 13:28:14 2019 +0200| [413c5b5dca87778095212fd69ca2a00cc41c2ac9] | committer: Steve Lhomme
caca: fix the Open/Close signatures
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=413c5b5dca87778095212fd69ca2a00cc41c2ac9
---
modules/video_output/caca.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index 617e9faf9e..b7d9040d37 100644
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -352,18 +352,16 @@ static void Manage(vout_display_t *vd)
/**
* This function initializes libcaca vout method.
*/
-static int Open(vlc_object_t *object)
+static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
+ video_format_t *fmtp, vlc_video_context *context)
{
- vout_display_t *vd = (vout_display_t *)object;
- const vout_display_cfg_t *cfg = vd->cfg;
- video_format_t *fmtp = &vd->fmt;
vout_display_sys_t *sys;
if (vout_display_cfg_IsWindowed(cfg))
return VLC_EGENERIC;
#if !defined(__APPLE__) && !defined(_WIN32)
# ifndef X_DISPLAY_MISSING
- if (!vlc_xlib_init(object))
+ if (!vlc_xlib_init(VLC_OBJECT(vd)))
return VLC_EGENERIC;
# endif
#endif
@@ -503,9 +501,8 @@ error:
/**
* Close a libcaca video output
*/
-static void Close(vlc_object_t *object)
+static void Close(vout_display_t *vd)
{
- vout_display_t *vd = (vout_display_t *)object;
vout_display_sys_t *sys = vd->sys;
if (sys->fifo != NULL) {
More information about the vlc-commits
mailing list