* another 1st string review, refs #438

diff --git a/modules/mux/asf.c b/modules/mux/asf.c
index 21fa7711193059a5153f2b8cd24f5e7ca238a4ec..6b23f61532352639acf33e38f1560852aff9c2d9 100644 (file)
--- a/modules/mux/asf.c
+++ b/modules/mux/asf.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * asf.c: asf muxer module for vlc
  *****************************************************************************
- * Copyright (C) 2003-2004 the VideoLAN team
+ * Copyright (C) 2003-2004, 2006 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -186,7 +186,7 @@ static int Open( vlc_object_t *p_this )
     vlc_value_t    val;
     int i;
 
-    msg_Dbg( p_mux, "Asf muxer opened" );
+    msg_Dbg( p_mux, "asf muxer opened" );
     sout_CfgParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg );
 
     p_mux->pf_control   = Control;
@@ -241,8 +241,8 @@ static int Open( vlc_object_t *p_this )
     var_Get( p_mux, SOUT_CFG_PREFIX "rating", &val );
     p_sys->psz_rating = val.psz_string;
 
-    msg_Dbg( p_mux, "meta data: title='%s' author='%s' copyright='%s' "
-             "comment='%s' rating='%s'",
+    msg_Dbg( p_mux, "meta data: title='%s', author='%s', copyright='%s', "
+             "comment='%s', rating='%s'",
              p_sys->psz_title, p_sys->psz_author, p_sys->psz_copyright,
              p_sys->psz_comment, p_sys->psz_rating );
 
@@ -334,7 +334,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
     msg_Dbg( p_mux, "adding input" );
     if( p_sys->i_track >= MAX_ASF_TRACKS )
     {
-        msg_Dbg( p_mux, "cannot add this track (too much track)" );
+        msg_Dbg( p_mux, "cannot add this track (too much tracks)" );
         return VLC_EGENERIC;
     }
 

diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c
index bfebe226f2f8949d75eb239e5bbbeb43d7302a70..d416b0d5b54ccf5577319e7865a7147d8dd5f596 100644 (file)
--- a/modules/mux/mp4.c
+++ b/modules/mux/mp4.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * mp4.c: mp4/mov muxer
  *****************************************************************************
- * Copyright (C) 2001, 2002, 2003 the VideoLAN team
+ * Copyright (C) 2001, 2002, 2003, 2006 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -42,10 +42,10 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define FASTSTART_TEXT N_("Create \"Fast start\" files")
+#define FASTSTART_TEXT N_("Create \"Fast Start\" files")
 #define FASTSTART_LONGTEXT N_( \
-    "When this option is turned on, \"Fast start\" files will be created. " \
-    "(\"Fast start\" files are optimized for download, allowing the user " \
+    "When this option is turned on, \"Fast Start\" files will be created. " \
+    "(\"Fast Start\" files are optimized for downloads and allow the user " \
     "to start previewing the file while it is downloading).")
 static int  Open   ( vlc_object_t * );
 static void Close  ( vlc_object_t * );
@@ -302,7 +302,7 @@ static void Close( vlc_object_t * p_this )
                                 p_sys->i_mdat_pos + i_size - i_chunk );
             if( sout_AccessOutRead( p_mux->p_access, p_buf ) < i_chunk )
             {
-                msg_Warn( p_this, "read() not supported by acces output, "
+                msg_Warn( p_this, "read() not supported by access output, "
                           "won't create a fast start file" );
                 p_sys->b_fast_start = VLC_FALSE;
                 block_Release( p_buf );
@@ -627,7 +627,7 @@ static int Mux( sout_mux_t *p_mux )
             if( i_length != 0 )
             {
                 /* TODO */
-                msg_Dbg( p_mux, "writing a empty subs" ) ;
+                msg_Dbg( p_mux, "writing an empty sub" ) ;
 
                 /* Append a idx entry */
                 p_stream->entry[p_stream->i_entry_count].i_pos    = p_sys->i_pos;
@@ -686,7 +686,7 @@ static void ConvertAVC1( sout_mux_t *p_mux, mp4_stream_t *tk, block_t *p_block )
 
 
     /* Replace the 4 bytes start code with 4 bytes size,
-     * FIXME are all startcode 4 bytes ? (I don't think :( */
+     * FIXME are all startcodes 4 bytes ? (I don't think :( */
     while( dat < end )
     {
         int i_size;

diff --git a/modules/mux/mpjpeg.c b/modules/mux/mpjpeg.c
index f46c947d0cf44a567181dc9effe4dbddcc32fdb1..0a16c7ddb6169b6bfbd3b5d060c6b910fa384ac6 100644 (file)
--- a/modules/mux/mpjpeg.c
+++ b/modules/mux/mpjpeg.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * mpjpeg.c: mime multipart jpeg  muxer module for vlc
  *****************************************************************************
- * Copyright (C) 2001, 2002 the VideoLAN team
+ * Copyright (C) 2001, 2002, 2006 the VideoLAN team
  * $Id$
  *
  * Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
@@ -31,9 +31,9 @@
 
 #define SEPARATOR_TEXT N_( "Multipart separator string" )
 #define SEPARATOR_LONGTEXT N_( "Multipart strings like MPJPEG use a " \
-                               "separator string between content pieces. "\
-                               "You can select this string. Default is "\
-                               "--myboundary" )
+                               "specific string to separate its content " \
+                               "pieces. You can select this string. " \
+                               "Default is --myboundary" )
 
 
 #define CONTENT_TYPE "Content-Type: image/jpeg"
@@ -47,7 +47,7 @@ static void Close  ( vlc_object_t * );
 
 vlc_module_begin();
     set_shortname( "MPJPEG" );
-    set_description( _("Multipart jpeg muxer") );
+    set_description( _("Multipart JPEG muxer") );
     set_capability( "sout mux", 5 );
     add_string( SOUT_CFG_PREFIX "separator", "--myboundary", NULL,
                               SEPARATOR_TEXT, SEPARATOR_LONGTEXT, VLC_TRUE );

diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c
index 2dac02b7b6de6a5ea7b7f79e615db169a3aa8d47..ab101ec1d8509c11dac5e61bf2b81d0b1fbbf6d7 100644 (file)
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * ogg.c: ogg muxer module for vlc
  *****************************************************************************
- * Copyright (C) 2001, 2002 the VideoLAN team
+ * Copyright (C) 2001, 2002, 2006 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -47,7 +47,7 @@ static int  Open   ( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("Ogg/ogm muxer") );
+    set_description( _("Ogg/OGM muxer") );
     set_capability( "sout mux", 10 );
     set_category( CAT_SOUT );
     set_subcategory( SUBCAT_SOUT_MUX );
@@ -517,7 +517,7 @@ static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input )
         }
         else
         {
-            /* Wasn't already added so get rid of it */
+            /* wasn't already added so get rid of it */
             FREE( p_stream->p_oggds_header );
             FREE( p_stream );
             p_sys->i_add_streams--;

diff --git a/modules/mux/wav.c b/modules/mux/wav.c
index a4d808bc01ebcdaab3c20c803d1cffd0237a6bb9..9b47da7feaaafec189674bfb0c91429ed4345703 100644 (file)
--- a/modules/mux/wav.c
+++ b/modules/mux/wav.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * wav.c: wav muxer module for vlc
  *****************************************************************************
- * Copyright (C) 2004 the VideoLAN team
+ * Copyright (C) 2004, 2006 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
@@ -171,7 +171,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
         return VLC_EGENERIC;
     }
 
-    msg_Dbg( p_mux, "adding input %i channels, %iHz",
+    msg_Dbg( p_mux, "adding %i input channels, %iHz",
              p_input->p_fmt->audio.i_channels,
              p_input->p_fmt->audio.i_rate );
 

diff --git a/modules/packetizer/copy.c b/modules/packetizer/copy.c
index 634bc8a0ac4eacf859a4acde8da4cab2f2ec92ef..d4128fe43398d297c8f5c89b874f21b00e77ba87 100644 (file)
--- a/modules/packetizer/copy.c
+++ b/modules/packetizer/copy.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * copy.c
  *****************************************************************************
- * Copyright (C) 2001, 2002 the VideoLAN team
+ * Copyright (C) 2001, 2002, 2006 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>

diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c
index d508fcb8fcff60dfa690de23fcbfd0b6c4a9eb40..b1e8c755fcdcd9b6e1cc30ee55dc84ee81486334 100644 (file)
--- a/modules/packetizer/h264.c
+++ b/modules/packetizer/h264.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * h264.c: h264/avc video packetizer
  *****************************************************************************
- * Copyright (C) 2001, 2002 the VideoLAN team
+ * Copyright (C) 2001, 2002, 2006 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -44,7 +44,7 @@ static void Close( vlc_object_t * );
 vlc_module_begin();
     set_category( CAT_SOUT );
     set_subcategory( SUBCAT_SOUT_PACKETIZER );
-    set_description( _("H264 video packetizer") );
+    set_description( _("H.264 video packetizer") );
     set_capability( "packetizer", 50 );
     set_callbacks( Open, Close );
 vlc_module_end();
@@ -203,7 +203,7 @@ static int Open( vlc_object_t *p_this )
             ParseNALBlock( p_dec, p_pps );
             p += 2 + i_length;
         }
-        msg_Dbg( p_dec, "avcC length size=%d sps=%d pps=%d",
+        msg_Dbg( p_dec, "avcC length size=%d, sps=%d, pps=%d",
                  p_sys->i_avcC_length_size, i_sps, i_pps );
 
         /* Set callback */

diff --git a/modules/packetizer/mpeg4audio.c b/modules/packetizer/mpeg4audio.c
index b49e468201e3d99fd42afc3f0cac02c4b83bd426..b8309b3588fd3f27cb3f70e5aab79d0e5d5f0dea 100644 (file)
--- a/modules/packetizer/mpeg4audio.c
+++ b/modules/packetizer/mpeg4audio.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * mpeg4audio.c: parse and packetize an MPEG 4 audio stream
  *****************************************************************************
- * Copyright (C) 2001, 2002 the VideoLAN team
+ * Copyright (C) 2001, 2002, 2006 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>

diff --git a/modules/packetizer/mpeg4video.c b/modules/packetizer/mpeg4video.c
index adb4384d8dcee6b92daafea634c08937e174230c..27c35725f0d3a6c3929936817deff161d818cadb 100644 (file)
--- a/modules/packetizer/mpeg4video.c
+++ b/modules/packetizer/mpeg4video.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * mpeg4video.c: mpeg 4 video packetizer
  *****************************************************************************
- * Copyright (C) 2001, 2002 the VideoLAN team
+ * Copyright (C) 2001, 2002, 2006 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -159,7 +159,7 @@ static int Open( vlc_object_t *p_this )
         memcpy( p_dec->fmt_out.p_extra, p_dec->fmt_in.p_extra,
                 p_dec->fmt_in.i_extra );
 
-        msg_Dbg( p_dec, "opening with vol size:%d", p_dec->fmt_in.i_extra );
+        msg_Dbg( p_dec, "opening with vol size: %d", p_dec->fmt_in.i_extra );
         m4v_VOLParse( p_dec, &p_dec->fmt_out,
                       p_dec->fmt_out.p_extra, p_dec->fmt_out.i_extra );
     }

diff --git a/modules/packetizer/mpegvideo.c b/modules/packetizer/mpegvideo.c
index f65e3b6a444130bc65ac11d98a8db2cd0803cb29..c5ae881f496a598b8ef0a0b1a79ce8f6474736dd 100644 (file)
--- a/modules/packetizer/mpegvideo.c
+++ b/modules/packetizer/mpegvideo.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * mpegvideo.c: parse and packetize an MPEG1/2 video stream
  *****************************************************************************
- * Copyright (C) 2001-2005 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2001-2006 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -49,10 +49,10 @@
 
 #include "vlc_block_helper.h"
 
-#define SYNC_INTRAFRAME_TEXT N_("Sync on intraframe")
+#define SYNC_INTRAFRAME_TEXT N_("Sync on Intra Frame")
 #define SYNC_INTRAFRAME_LONGTEXT N_("Normally the packetizer would " \
     "sync on the next full frame. This flags instructs the packetizer " \
-    "to sync on the first intraframe found.")
+    "to sync on the first Intra Frame found.")
 
 /*****************************************************************************
  * Module descriptor
@@ -189,7 +189,7 @@ static int Open( vlc_object_t *p_this )
     p_sys->b_discontinuity = VLC_FALSE;
     p_sys->b_sync_on_intra_frame = var_CreateGetBool( p_dec, "packetizer-mpegvideo-sync-iframe" );
     if( p_sys->b_sync_on_intra_frame )
-        msg_Dbg( p_dec, "syncing happens on intraframe now." );
+        msg_Dbg( p_dec, "syncing on intra frame now" );
 
     return VLC_SUCCESS;
 }
@@ -322,13 +322,13 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
             {
                 if( p_pic->i_flags & BLOCK_FLAG_TYPE_I )
                 {
-                    msg_Dbg( p_dec, "synced on Intra frame" );
+                    msg_Dbg( p_dec, "synced on intra frame" );
                     p_sys->b_discontinuity = VLC_FALSE;
                     p_pic->i_flags |= BLOCK_FLAG_DISCONTINUITY;
                 }
                 else
                 {
-                    msg_Dbg( p_dec, "waiting on Intra frame" );
+                    msg_Dbg( p_dec, "waiting on intra frame" );
                     p_sys->i_state = STATE_NOSYNC;
                     block_Release( p_pic );
                     break;
@@ -554,7 +554,7 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag )
 
         if ( !p_sys->b_inited )
         {
-            msg_Dbg( p_dec, "Size %dx%d fps=%.3f",
+            msg_Dbg( p_dec, "size %dx%d fps=%.3f",
                  p_dec->fmt_out.video.i_width, p_dec->fmt_out.video.i_height,
                  p_sys->i_frame_rate / (float)p_sys->i_frame_rate_base );
             p_sys->b_inited = 1;