videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-04 09:11:33 +02:00
Code Releases Activity

caca: fix the Open/Close signatures

Browse Source
This commit is contained in:
Steve Lhomme 2019-07-09 13:28:14 +02:00
parent 025b0b2bbf
commit 413c5b5dca
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/video_output/caca.c
View File

@ -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) {