[vlc-devel] commit: Spelling: mili -> milli. ( Rémi Denis-Courmont )

git version control git at videolan.org
Sun Aug 31 14:19:28 CEST 2008


vlc | branch: 0.8.6-bugfix | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Aug 31 15:21:48 2008 +0300| [bcc90febdeadb0598eddcc50a6f095e0b4a4e645] | committer: Rémi Denis-Courmont 

Spelling: mili -> milli.

Conflicts:

	src/misc/mtime.c

Signed-off-by: Rémi Denis-Courmont <rdenis at simphalempin.com>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bcc90febdeadb0598eddcc50a6f095e0b4a4e645
---

 modules/demux/ogg.c |    2 +-
 modules/mux/ogg.c   |    2 +-
 src/misc/mtime.c    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index ac64be2..fad8641 100644
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -1100,7 +1100,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 ab101ec..f5aac19 100644
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -976,7 +976,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/src/misc/mtime.c b/src/misc/mtime.c
index 6cc4573..b08c1ff 100644
--- a/src/misc/mtime.c
+++ b/src/misc/mtime.c
@@ -162,7 +162,7 @@ mtime_t mdate( void )
     }
     else
     {
-        /* Fallback on GetTickCount() which has a milisecond resolution
+        /* Fallback on GetTickCount() which has a millisecond resolution
          * (actually, best case is about 10 ms resolution)
          * GetTickCount() 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