[vlc-devel] commit: Spelling: mili -> milli. (Pavlov Konstantin )
git version control
git at videolan.org
Thu Aug 28 21:29:15 CEST 2008
vlc | branch: master | Pavlov Konstantin <thresh at altlinux.ru> | Wed Aug 27 18:12:42 2008 +0400| [bd03c387b82dad16831e76091aae66b37080910b] | committer: Pavlov Konstantin
Spelling: mili -> milli.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bd03c387b82dad16831e76091aae66b37080910b
---
modules/access/rtmp/rtmp_amf_flv.c | 2 +-
modules/demux/ogg.c | 2 +-
modules/mux/ogg.c | 2 +-
modules/video_filter/remoteosd.c | 2 +-
share/lua/README.txt | 4 ++--
src/input/vlmshell.c | 2 +-
src/libvlc-module.c | 8 ++++----
src/misc/mtime.c | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/modules/access/rtmp/rtmp_amf_flv.c b/modules/access/rtmp/rtmp_amf_flv.c
index 2299db1..554bf74 100644
--- a/modules/access/rtmp/rtmp_amf_flv.c
+++ b/modules/access/rtmp/rtmp_amf_flv.c
@@ -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; /* milliseconds */
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;
diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 2eb3433..bb0632b 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -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 millisec */
}
else
{
diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c
index ed60f58..236b247 100644
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -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 millisec */
op.granulepos = ( p_data->i_dts - p_sys->i_start_dts ) / 1000;
}
diff --git a/modules/video_filter/remoteosd.c b/modules/video_filter/remoteosd.c
index 9fc04be..1bd84ca 100644
--- a/modules/video_filter/remoteosd.c
+++ b/modules/video_filter/remoteosd.c
@@ -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 milliseconds, 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)
diff --git a/share/lua/README.txt b/share/lua/README.txt
index 6814fe4..6f0790f 100644
--- a/share/lua/README.txt
+++ b/share/lua/README.txt
@@ -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 milliseconds).
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 milliseconds). For example:
local l = vlc.net.listen_tcp( "localhost", 1234 )
while true do
local fd = l:accept( 500 )
diff --git a/src/input/vlmshell.c b/src/input/vlmshell.c
index 0d8bc10..2aeccff 100644
--- a/src/input/vlmshell.c
+++ b/src/input/vlmshell.c
@@ -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 | [+-](milliseconds)ms" );
return VLC_SUCCESS;
}
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 6c27680..5bf3336 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -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 milliseconds")
#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 milliseconds, 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 milliseconds")
#define MOUSE_HIDE_TIMEOUT_LONGTEXT N_( \
"Hide mouse cursor and fullscreen controller after " \
- "n miliseconds, default is 3000 ms (3 sec.)")
+ "n milliseconds, 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[] =
diff --git a/src/misc/mtime.c b/src/misc/mtime.c
index 4ecf12a..0d1e062 100644
--- a/src/misc/mtime.c
+++ b/src/misc/mtime.c
@@ -265,7 +265,7 @@ mtime_t mdate( void )
}
else
{
- /* Fallback on timeGetTime() which has a milisecond resolution
+ /* Fallback on timeGetTime() which has a millisecond 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. */
More information about the vlc-devel
mailing list