Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
ae6f2253
Commit
ae6f2253
authored
Oct 10, 2002
by
Christophe Massiot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not use vasprintf under Mac OS X because OS X.1 doesn't have that (how
lame...).
parent
2b15f624
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
modules/demux/mp4/libmp4.c
modules/demux/mp4/libmp4.c
+3
-3
src/input/input_info.c
src/input/input_info.c
+2
-2
src/misc/messages.c
src/misc/messages.c
+4
-4
No files found.
modules/demux/mp4/libmp4.c
View file @
ae6f2253
...
...
@@ -2,7 +2,7 @@
* libmp4.c : LibMP4 library for mp4 module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: libmp4.c,v 1.
6 2002/09/18 23:34:28 fenrir
Exp $
* $Id: libmp4.c,v 1.
7 2002/10/10 22:46:20 massiot
Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
...
...
@@ -2390,7 +2390,7 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result,
MP4_Box_t
*
p_box
,
char
*
psz_fmt
,
va_list
args
)
{
char
*
psz_path
;
#if
ndef HAVE_VASPRINTF
#if
!defined(HAVE_VASPRINTF) || defined(SYS_DARWIN)
int
i_size
;
#endif
...
...
@@ -2401,7 +2401,7 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result,
return
;
}
#if
def HAVE_VASPRINTF
#if
defined(HAVE_VASPRINTF) && !defined(SYS_DARWIN)
vasprintf
(
&
psz_path
,
psz_fmt
,
args
);
#else
i_size
=
strlen
(
psz_fmt
)
+
1024
;
...
...
src/input/input_info.c
View file @
ae6f2253
...
...
@@ -2,7 +2,7 @@
* input_info.c: Convenient functions to handle the input info structures
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: input_info.c,v 1.
5 2002/08/18 13:16:51 sigmunau
Exp $
* $Id: input_info.c,v 1.
6 2002/10/10 22:46:20 massiot
Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
...
...
@@ -103,7 +103,7 @@ int input_AddInfo( input_info_category_t * p_category, char * psz_name,
/*
* Convert message to string
*/
#if
def HAVE_VASPRINTF
#if
defined(HAVE_VASPRINTF) && !defined(SYS_DARWIN)
vasprintf
(
&
psz_str
,
psz_format
,
args
);
#else
psz_str
=
(
char
*
)
malloc
(
strlen
(
psz_format
)
+
INTF_MAX_MSG_SIZE
);
...
...
src/misc/messages.c
View file @
ae6f2253
...
...
@@ -4,7 +4,7 @@
* modules, especially intf modules. See config.h for output configuration.
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: messages.c,v 1.1
3 2002/10/08 18:10:10 sam
Exp $
* $Id: messages.c,v 1.1
4 2002/10/10 22:46:20 massiot
Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
...
...
@@ -259,14 +259,14 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
#ifdef WIN32
char
*
psz_temp
;
#endif
#if
ndef HAVE_VASPRINTF
#if
!defined(HAVE_VASPRINTF) || defined(SYS_DARWIN)
int
i_size
=
strlen
(
psz_format
)
+
INTF_MAX_MSG_SIZE
;
#endif
/*
* Convert message to string
*/
#if
def HAVE_VASPRINTF
#if
defined(HAVE_VASPRINTF) && !defined(SYS_DARWIN)
vasprintf
(
&
psz_str
,
psz_format
,
args
);
#else
psz_str
=
(
char
*
)
malloc
(
i_size
*
sizeof
(
char
)
);
...
...
@@ -281,7 +281,7 @@ static void QueueMsg( vlc_object_t *p_this, int i_type, const char *psz_module,
return
;
}
#if
ndef HAVE_VASPRINTF
#if
!defined(HAVE_VASPRINTF) || defined(SYS_DARWIN)
# ifdef WIN32
psz_temp
=
ConvertPrintfFormatString
(
psz_format
);
if
(
!
psz_temp
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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