Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
97d84d1a
Commit
97d84d1a
authored
Dec 02, 2003
by
gbazin
Browse files
ALL: MSVC compilation fixes to libvlc.
parent
6e4faeb0
Changes
7
Hide whitespace changes
Inline
Side-by-side
include/variables.h
View file @
97d84d1a
...
...
@@ -2,7 +2,7 @@
* variables.h: variables handling
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: variables.h,v 1.1
8
2003/1
0/29 01:33:27
gbazin Exp $
* $Id: variables.h,v 1.1
9
2003/1
2/02 12:57:35
gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
...
...
@@ -255,7 +255,7 @@ static inline int __var_SetInteger( vlc_object_t *p_obj, const char *psz_name, i
* \param psz_name The name of the variable
* \param i The new time value of this variable
*/
static
inline
int
__var_SetTime
(
vlc_object_t
*
p_obj
,
const
char
*
psz_name
,
signed
long
long
i
)
static
inline
int
__var_SetTime
(
vlc_object_t
*
p_obj
,
const
char
*
psz_name
,
int64_t
i
)
{
vlc_value_t
val
;
val
.
i_time
=
i
;
...
...
include/vlc/vlc.h
View file @
97d84d1a
...
...
@@ -2,7 +2,7 @@
* vlc.h: global header for vlc
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vlc.h,v 1.2
7
2003/
09/20 19:37:53 hartma
n Exp $
* $Id: vlc.h,v 1.2
8
2003/
12/02 12:57:35 gbazi
n Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
...
...
@@ -42,7 +42,12 @@ typedef union
void
*
p_address
;
vlc_object_t
*
p_object
;
vlc_list_t
*
p_list
;
#if defined( WIN32 ) && !defined( __MINGW32__ )
signed
__int64
i_time
;
# else
signed
long
long
i_time
;
#endif
struct
{
char
*
psz_name
;
int
i_object_id
;
}
var
;
...
...
src/input/es_out.c
View file @
97d84d1a
...
...
@@ -2,7 +2,7 @@
* es_out.c: Es Out handler for input.
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: es_out.c,v 1.
5
2003/1
1/30 17:29:56 fenrir
Exp $
* $Id: es_out.c,v 1.
6
2003/1
2/02 12:57:35 gbazin
Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
@@ -228,7 +228,7 @@ static es_out_id_t *EsOutAdd( es_out_t *out, es_format_t *fmt )
input_thread_t
*
p_input
=
p_sys
->
p_input
;
es_out_id_t
*
es
=
malloc
(
sizeof
(
es_out_id_t
)
);
pgrm_descriptor_t
*
p_prgm
=
NULL
;
char
psz_cat
[
s
trlen
(
"Stream "
)
+
10
];
char
psz_cat
[
s
izeof
(
"Stream "
)
+
10
];
input_info_category_t
*
p_cat
;
vlc_mutex_lock
(
&
p_input
->
stream
.
stream_lock
);
...
...
src/input/input.c
View file @
97d84d1a
...
...
@@ -4,7 +4,7 @@
* decoders.
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* $Id: input.c,v 1.2
69
2003/1
1/30 16:00:24 fenrir
Exp $
* $Id: input.c,v 1.2
70
2003/1
2/02 12:57:35 gbazin
Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
...
...
@@ -43,7 +43,7 @@
#include
"vlc_interface.h"
#include
"codecs.h"
#include
"modules/demux/util/sub.h"
#include
"
../../
modules/demux/util/sub.h"
/*****************************************************************************
* Local prototypes
...
...
@@ -509,7 +509,7 @@ static int RunThread( input_thread_t *p_input )
subtitle_Demux
(
p_input
->
p_sys
->
sub
[
i
],
i_time
);
}
i_update_next
=
mdate
()
+
150000
LL
;
i_update_next
=
mdate
()
+
I64C
(
150000
)
;
}
}
...
...
src/input/subtitles.c
View file @
97d84d1a
...
...
@@ -2,7 +2,7 @@
* subtitles.c
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: subtitles.c,v 1.
4
2003/1
0/11 22:40:05 hartma
n Exp $
* $Id: subtitles.c,v 1.
5
2003/1
2/02 12:57:36 gbazi
n Exp $
*
* Authors: Derk-Jan Hartman <hartman at videolan.org>
* This is adapted code from the GPL'ed MPlayer (http://mplayerhq.hu)
...
...
@@ -32,7 +32,13 @@
#include
<vlc/input.h>
#include
"ninput.h"
#include
<dirent.h>
#ifdef HAVE_DIRENT_H
# include <dirent.h>
#else
# include "../extras/dirent.h"
#endif
#include
<ctype.h>
/**
...
...
src/misc/win32_specific.c
View file @
97d84d1a
...
...
@@ -2,7 +2,7 @@
* win32_specific.c: Win32 specific features
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: win32_specific.c,v 1.2
6
2003/1
0
/0
3
1
3:35:56 sam
Exp $
* $Id: win32_specific.c,v 1.2
7
2003/1
2
/0
2
1
2:57:36 gbazin
Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Gildas Bazin <gbazin@netcourrier.com>
...
...
@@ -32,6 +32,7 @@
#endif
#if !defined( UNDER_CE )
# include <io.h>
# include <fcntl.h>
# include <winsock2.h>
#endif
...
...
src/playlist/playlist.c
View file @
97d84d1a
...
...
@@ -2,7 +2,7 @@
* playlist.c : Playlist management functions
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: playlist.c,v 1.6
6
2003/1
1/29 11:12:46 fenrir
Exp $
* $Id: playlist.c,v 1.6
7
2003/1
2/02 12:57:36 gbazin
Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
...
...
@@ -249,7 +249,7 @@ static void ObjectGarbageCollector( playlist_t *p_playlist,
if
(
*
pi_obj_destroyed_date
==
0
)
{
/* give a little time */
*
pi_obj_destroyed_date
=
mdate
()
+
300000
LL
;
*
pi_obj_destroyed_date
=
mdate
()
+
I64C
(
300000
)
;
}
else
{
...
...
Write
Preview
Supports
Markdown
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