[vlc-commits] s/informations/information

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Sep 11 16:42:14 2013 +0200| [2d4b2ba4e270fee99e32f50e3c9948b92c38e5fe] | committer: Jean-Baptiste Kempf

s/informations/information

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

 include/vlc/libvlc.h          |   10 +++++-----
 include/vlc_interface.h       |    2 +-
 modules/access/bluray.c       |    2 +-
 modules/access/live555.cpp    |    2 +-
 modules/codec/avcodec/video.c |    2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index 485f4ff..5cf0ad2 100644
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -215,7 +215,7 @@ void libvlc_set_user_agent( libvlc_instance_t *p_instance,
                             const char *name, const char *http );
 
 /**
- * Sets some meta-informations about the application.
+ * Sets some meta-information about the application.
  * See also libvlc_set_user_agent().
  *
  * \param p_instance LibVLC instance
@@ -353,7 +353,7 @@ enum libvlc_log_level
 typedef struct vlc_log_t libvlc_log_t;
 
 /**
- * Gets debugging informations about a log message: the name of the VLC module
+ * Gets debugging information about a log message: the name of the VLC module
  * emitting the message and the message location within the source code.
  *
  * The returned module name and file name will be NULL if unknown.
@@ -372,9 +372,9 @@ LIBVLC_API void libvlc_log_get_context(const libvlc_log_t *ctx,
                        const char **module, const char **file, unsigned *line);
 
 /**
- * Gets VLC object informations about a log message: the type name of the VLC
+ * Gets VLC object information about a log message: the type name of the VLC
  * object emitting the message, the object header if any and a temporaly-unique
- * object identifier. These informations are mainly meant for <b>manual</b>
+ * object identifier. These information are mainly meant for <b>manual</b>
  * troubleshooting.
  *
  * The returned type name may be "generic" if unknown, but it cannot be NULL.
@@ -399,7 +399,7 @@ LIBVLC_API void libvlc_log_get_object(const libvlc_log_t *ctx,
  * Callback prototype for LibVLC log message handler.
  * \param data data pointer as given to libvlc_log_set()
  * \param level message level (@ref enum libvlc_log_level)
- * \param ctx message context (meta-informations about the message)
+ * \param ctx message context (meta-information about the message)
  * \param fmt printf() format string (as defined by ISO C11)
  * \param args variable argument list for the format
  * \note Log message handlers <b>must</b> be thread-safe.
diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 9bc6241..485c303 100644
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -105,7 +105,7 @@ VLC_API void libvlc_Quit( libvlc_int_t * );
  * Message logging callback signature.
  * \param data data pointer as provided to vlc_msg_SetCallback().
  * \param type message type (VLC_MSG_* values from enum vlc_log_type)
- * \param item meta informations
+ * \param item meta information
  * \param fmt format string
  * \param args format string arguments
  */
diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index e859431..a0c4eb6 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -128,7 +128,7 @@ struct  demux_sys_t
     unsigned int        i_current_clip;
     input_title_t       **pp_title;
 
-    /* Meta informations */
+    /* Meta information */
     const META_DL       *p_meta;
 
     /* Menus */
diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index 7a1ab16..b61546b 100644
--- a/modules/access/live555.cpp
+++ b/modules/access/live555.cpp
@@ -1804,7 +1804,7 @@ static void StreamRead( void *p_private, unsigned int i_size,
         QuickTimeGenericRTPSource::QTState &qtState = qtRTPSource->qtState;
         uint8_t *sdAtom = (uint8_t*)&qtState.sdAtom[4];
 
-        /* Get codec informations from the quicktime atoms :
+        /* Get codec information from the quicktime atoms :
          * http://developer.apple.com/quicktime/icefloe/dispatch026.html */
         if( tk->fmt.i_cat == VIDEO_ES ) {
             if( qtState.sdAtomSize < 16 + 32 )
diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 9622a94..29c6491 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -1292,7 +1292,7 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
     if (!can_hwaccel)
         goto end;
 
-    /* Profile and level informations are needed now.
+    /* Profile and level information are needed now.
      * TODO: avoid code duplication with avcodec.c */
     if( p_context->profile != FF_PROFILE_UNKNOWN)
         p_dec->fmt_in.i_profile = p_context->profile;