Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
1548a691
Commit
1548a691
authored
Mar 22, 2006
by
Sam Hocevar
Browse files
* modules/video_output/caca.c: Compilation fixes.
parent
20edd952
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/video_output/caca.c
View file @
1548a691
...
...
@@ -149,7 +149,7 @@ static int Create( vlc_object_t *p_this )
}
#ifdef CACA_API_VERSION_1
p_vout
->
p_sys
->
p_qq
=
cucul_init
();
p_vout
->
p_sys
->
p_qq
=
cucul_init
(
0
,
0
);
if
(
!
p_vout
->
p_sys
->
p_qq
)
{
msg_Err
(
p_vout
,
"cannot initialize libcucul"
);
...
...
@@ -210,22 +210,15 @@ static int Init( vout_thread_t *p_vout )
/* Create the libcaca bitmap */
p_vout
->
p_sys
->
p_bitmap
=
#ifdef CACA_API_VERSION_1
cucul_create_bitmap
(
p_vout
->
p_sys
->
p_qq
,
32
,
p_vout
->
output
.
i_width
,
p_vout
->
output
.
i_height
,
4
*
((
p_vout
->
output
.
i_width
+
15
)
&
~
15
),
p_vout
->
output
.
i_rmask
,
p_vout
->
output
.
i_gmask
,
p_vout
->
output
.
i_bmask
,
0x00000000
);
cucul_create_bitmap
#else
caca_create_bitmap
(
32
,
p_vout
->
output
.
i_width
,
p_vout
->
output
.
i_height
,
4
*
((
p_vout
->
output
.
i_width
+
15
)
&
~
15
),
p_vout
->
output
.
i_rmask
,
p_vout
->
output
.
i_gmask
,
p_vout
->
output
.
i_bmask
,
0x00000000
);
caca_create_bitmap
#endif
(
32
,
p_vout
->
output
.
i_width
,
p_vout
->
output
.
i_height
,
4
*
((
p_vout
->
output
.
i_width
+
15
)
&
~
15
),
p_vout
->
output
.
i_rmask
,
p_vout
->
output
.
i_gmask
,
p_vout
->
output
.
i_bmask
,
0x00000000
);
if
(
!
p_vout
->
p_sys
->
p_bitmap
)
{
msg_Err
(
p_vout
,
"could not create libcaca bitmap"
);
...
...
@@ -271,7 +264,7 @@ static int Init( vout_thread_t *p_vout )
static
void
End
(
vout_thread_t
*
p_vout
)
{
#ifdef CACA_API_VERSION_1
cucul_free_bitmap
(
p_vout
->
p_sys
->
p_qq
,
p_vout
->
p_sys
->
p_bitmap
);
cucul_free_bitmap
(
p_vout
->
p_sys
->
p_bitmap
);
#else
caca_free_bitmap
(
p_vout
->
p_sys
->
p_bitmap
);
#endif
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment