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
bd03c387
Commit
bd03c387
authored
Aug 27, 2008
by
Pavlov Konstantin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Spelling: mili -> milli.
parent
4fcab61a
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
12 additions
and
12 deletions
+12
-12
modules/access/rtmp/rtmp_amf_flv.c
modules/access/rtmp/rtmp_amf_flv.c
+1
-1
modules/demux/ogg.c
modules/demux/ogg.c
+1
-1
modules/mux/ogg.c
modules/mux/ogg.c
+1
-1
modules/video_filter/remoteosd.c
modules/video_filter/remoteosd.c
+1
-1
share/lua/README.txt
share/lua/README.txt
+2
-2
src/input/vlmshell.c
src/input/vlmshell.c
+1
-1
src/libvlc-module.c
src/libvlc-module.c
+4
-4
src/misc/mtime.c
src/misc/mtime.c
+1
-1
No files found.
modules/access/rtmp/rtmp_amf_flv.c
View file @
bd03c387
...
...
@@ -116,7 +116,7 @@ const double RTMP_DEFAULT_STREAM_SERVER_ID = 1.0;
/* misc */
const
uint16_t
MAX_EMPTY_BLOCKS
=
200
;
/* empty blocks in fifo for media*/
const
uint16_t
RTMP_BODY_SIZE_ALLOC
=
1024
;
const
uint32_t
RTMP_TIME_CLIENT_BUFFER
=
2000
;
/* miliseconds */
const
uint32_t
RTMP_TIME_CLIENT_BUFFER
=
2000
;
/* mil
l
iseconds */
const
uint32_t
RTMP_SERVER_BW
=
0x00000200
;
const
uint32_t
RTMP_SRC_DST_CONNECT_OBJECT
=
0x00000000
;
const
uint32_t
RTMP_SRC_DST_CONNECT_OBJECT2
=
0x00000001
;
...
...
modules/demux/ogg.c
View file @
bd03c387
...
...
@@ -1194,7 +1194,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux )
msg_Dbg
(
p_demux
,
"found text subtitles header"
);
p_stream
->
fmt
.
i_cat
=
SPU_ES
;
p_stream
->
fmt
.
i_codec
=
VLC_FOURCC
(
's'
,
'u'
,
'b'
,
't'
);
p_stream
->
f_rate
=
1000
;
/* granulepos is in milisec */
p_stream
->
f_rate
=
1000
;
/* granulepos is in mil
l
isec */
}
else
{
...
...
modules/mux/ogg.c
View file @
bd03c387
...
...
@@ -999,7 +999,7 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input )
}
else
if
(
p_stream
->
i_cat
==
SPU_ES
)
{
/* granulepos is in milisec */
/* granulepos is in mil
l
isec */
op
.
granulepos
=
(
p_data
->
i_dts
-
p_sys
->
i_start_dts
)
/
1000
;
}
...
...
modules/video_filter/remoteosd.c
View file @
bd03c387
...
...
@@ -282,7 +282,7 @@ static int CreateFilter ( vlc_object_t *p_this )
p_sys
->
i_alpha
=
var_CreateGetIntegerCommand
(
p_this
,
RMTOSD_CFG
"alpha"
);
/* in miliseconds, 0 disables polling, should not be lower than 100 */
/* in mil
l
iseconds, 0 disables polling, should not be lower than 100 */
p_sys
->
i_vnc_poll_interval
=
var_CreateGetIntegerCommand
(
p_this
,
RMTOSD_CFG
"update"
);
if
(
p_sys
->
i_vnc_poll_interval
<
100
)
...
...
share/lua/README.txt
View file @
bd03c387
...
...
@@ -96,7 +96,7 @@ misc.cachedir(): Get the user's VLC cache directory.
misc.datadir_list( name ): FIXME: write description ... or ditch function if it isn't usefull anymore, we have datadir and userdatadir :)
misc.mdate(): Get the current date (in miliseconds).
misc.mdate(): Get the current date (in mil
l
iseconds).
misc.lock_and_wait(): Lock our object thread and wait for a wake up signal.
misc.signal(): Wake up our object thread.
...
...
@@ -111,7 +111,7 @@ net.url_parse( url, [option delimiter] ): Parse URL. Returns a table with
"option".
net.listen_tcp( host, port ): Listen to TCP connections. This returns an
object with an accept method. This method takes an optional timeout
argument (in miliseconds). For example:
argument (in mil
l
iseconds). For example:
local l = vlc.net.listen_tcp( "localhost", 1234 )
while true do
local fd = l:accept( 500 )
...
...
src/input/vlmshell.c
View file @
bd03c387
...
...
@@ -336,7 +336,7 @@ static int ExecuteHelp( vlm_message_t **pp_status )
MessageAddChild
(
"play [input_number]"
);
MessageAddChild
(
"pause"
);
MessageAddChild
(
"stop"
);
MessageAddChild
(
"seek [+-](percentage) | [+-](seconds)s | [+-](miliseconds)ms"
);
MessageAddChild
(
"seek [+-](percentage) | [+-](seconds)s | [+-](mil
l
iseconds)ms"
);
return
VLC_SUCCESS
;
}
...
...
src/libvlc-module.c
View file @
bd03c387
...
...
@@ -412,19 +412,19 @@ static const char *const ppsz_align_descriptions[] =
#define VIDEO_TITLE_SHOW_LONGTEXT N_( \
"Display the title of the video on top of the movie.")
#define VIDEO_TITLE_TIMEOUT_TEXT N_("Show video title for x miliseconds")
#define VIDEO_TITLE_TIMEOUT_TEXT N_("Show video title for x mil
l
iseconds")
#define VIDEO_TITLE_TIMEOUT_LONGTEXT N_( \
"Show the video title for n miliseconds, default is 5000 ms (5 sec.)")
"Show the video title for n mil
l
iseconds, default is 5000 ms (5 sec.)")
#define VIDEO_TITLE_POSITION_TEXT N_("Position of video title")
#define VIDEO_TITLE_POSITION_LONGTEXT N_( \
"Place on video where to display the title (default bottom center).")
#define MOUSE_HIDE_TIMEOUT_TEXT N_("Hide cursor and fullscreen " \
"controller after x miliseconds")
"controller after x mil
l
iseconds")
#define MOUSE_HIDE_TIMEOUT_LONGTEXT N_( \
"Hide mouse cursor and fullscreen controller after " \
"n miliseconds, default is 3000 ms (3 sec.)")
"n mil
l
iseconds, default is 3000 ms (3 sec.)")
static
const
int
pi_pos_values
[]
=
{
0
,
1
,
2
,
4
,
8
,
5
,
6
,
9
,
10
};
static
const
char
*
const
ppsz_pos_descriptions
[]
=
...
...
src/misc/mtime.c
View file @
bd03c387
...
...
@@ -265,7 +265,7 @@ mtime_t mdate( void )
}
else
{
/* Fallback on timeGetTime() which has a milisecond resolution
/* Fallback on timeGetTime() which has a mil
l
isecond resolution
* (actually, best case is about 5 ms resolution)
* timeGetTime() only returns a DWORD thus will wrap after
* about 49.7 days so we try to detect the wrapping. */
...
...
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