Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
a46b3001
Commit
a46b3001
authored
Aug 09, 2002
by
Sam Hocevar
Browse files
* ./src/libvlc.c: p_vlc->pf_memset is now usable (it's always the libc
default though).
parent
be0b42d9
Changes
3
Hide whitespace changes
Inline
Side-by-side
include/main.h
View file @
a46b3001
...
...
@@ -3,7 +3,7 @@
* Declaration and extern access to global program object.
*****************************************************************************
* Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
* $Id: main.h,v 1.4
2
2002/0
7/31 20:56:50
sam Exp $
* $Id: main.h,v 1.4
3
2002/0
8/09 16:39:08
sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
...
...
@@ -55,7 +55,7 @@ struct vlc_t
/* Fast memcpy plugin used */
module_t
*
p_memcpy_module
;
void
*
(
*
pf_memcpy
)
(
void
*
,
const
void
*
,
size_t
);
void
*
(
*
pf_memset
)
(
void
*
,
int
,
size_t
);
/* FIXME: unimplemented */
void
*
(
*
pf_memset
)
(
void
*
,
int
,
size_t
);
/* The module bank */
module_bank_t
*
p_module_bank
;
...
...
modules/misc/memcpy/memcpy.c
View file @
a46b3001
...
...
@@ -2,7 +2,7 @@
* memcpy.c : classic memcpy module
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: memcpy.c,v 1.
1
2002/08/0
4
1
7:23:43
sam Exp $
* $Id: memcpy.c,v 1.
2
2002/08/0
9
1
6:39:08
sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
...
...
@@ -64,8 +64,10 @@ static int Activate ( vlc_object_t *p_this )
{
#ifdef MODULE_NAME_IS_memcpy
p_this
->
p_vlc
->
pf_memcpy
=
memcpy
;
p_this
->
p_vlc
->
pf_memset
=
memset
;
#else
p_this
->
p_vlc
->
pf_memcpy
=
fast_memcpy
;
p_this
->
p_vlc
->
pf_memset
=
NULL
;
#endif
return
VLC_SUCCESS
;
...
...
src/libvlc.c
View file @
a46b3001
...
...
@@ -2,7 +2,7 @@
* libvlc.c: main libvlc source
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: libvlc.c,v 1.2
3
2002/08/0
8 22:28:23
sam Exp $
* $Id: libvlc.c,v 1.2
4
2002/08/0
9 16:39:08
sam Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
...
...
@@ -455,12 +455,16 @@ vlc_error_t vlc_init_r( vlc_t *p_vlc, int i_argc, char *ppsz_argv[] )
*/
p_vlc
->
p_memcpy_module
=
module_Need
(
p_vlc
,
"memcpy"
,
"$memcpy"
);
if
(
p_vlc
->
p_memcpy
_module
==
NULL
)
if
(
p_vlc
->
p
f
_memcpy
==
NULL
)
{
msg_Warn
(
p_vlc
,
"no suitable memcpy module, using libc default"
);
p_vlc
->
pf_memcpy
=
memcpy
;
}
if
(
p_vlc
->
pf_memset
==
NULL
)
{
p_vlc
->
pf_memset
=
memset
;
}
/*
* Initialize shared resources and libraries
*/
...
...
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