[MPlayer-cvslog] r31913 - in trunk: etc/codecs.conf help/help_mp-en.h libao2/ao_alsa.c libmpcodecs/vd_lzo.c libmpdemux/aviheader.c libmpdemux/genres.h libvo/vo_gl2.c libvo/vo_pnm.c libvo/vo_xvmc.c libvo/x11_common....

siretart subversion at mplayerhq.hu
Tue Aug 3 17:55:18 CEST 2010


Author: siretart
Date: Tue Aug  3 17:55:17 2010
New Revision: 31913

Log:
various spelling fixes, found by the Debian QA tool 'lintian'

Modified:
   trunk/etc/codecs.conf
   trunk/libao2/ao_alsa.c
   trunk/libmpcodecs/vd_lzo.c
   trunk/libmpdemux/aviheader.c
   trunk/libmpdemux/genres.h
   trunk/libvo/vo_gl2.c
   trunk/libvo/vo_pnm.c
   trunk/libvo/vo_xvmc.c
   trunk/libvo/x11_common.c
   trunk/m_option.c
   trunk/stream/pnm.c
   trunk/stream/tvi_v4l.c
   trunk/stream/tvi_v4l2.c
   trunk/vidix/mga_vid.c
   trunk/vidix/pci.db

Changes in other areas also in this revision:
Modified:
   trunk/help/help_mp-en.h

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Tue Aug  3 15:02:07 2010	(r31912)
+++ trunk/etc/codecs.conf	Tue Aug  3 17:55:17 2010	(r31913)
@@ -2212,7 +2212,7 @@ videocodec mwv1
   out BGR24,BGR15 flip
 
 videocodec wavcvfw
-  info "centre for wavelets, approximation and infromation processing"
+  info "centre for wavelets, approximation and information processing"
   status working
   fourcc wavc
   driver vfw

Modified: trunk/libao2/ao_alsa.c
==============================================================================
--- trunk/libao2/ao_alsa.c	Tue Aug  3 15:02:07 2010	(r31912)
+++ trunk/libao2/ao_alsa.c	Tue Aug  3 17:55:17 2010	(r31913)
@@ -62,7 +62,7 @@ static const ao_info_t info =
     "ALSA-0.9.x-1.x audio output",
     "alsa",
     "Alex Beregszaszi, Zsolt Barat <joy at streamminister.de>",
-    "under developement"
+    "under development"
 };
 
 LIBAO_EXTERN(alsa)

Modified: trunk/libmpcodecs/vd_lzo.c
==============================================================================
--- trunk/libmpcodecs/vd_lzo.c	Tue Aug  3 15:02:07 2010	(r31912)
+++ trunk/libmpcodecs/vd_lzo.c	Tue Aug  3 17:55:17 2010	(r31913)
@@ -122,10 +122,10 @@ static mp_image_t* decode(sh_video_t *sh
 
 	if (w == 0) {
 	    priv->codec = IMGFMT_BGR24;
-	    mp_msg (MSGT_DECVIDEO, MSGL_V, "[%s] codec choosen is BGR24\n", MOD_NAME);
+	    mp_msg (MSGT_DECVIDEO, MSGL_V, "[%s] codec chosen is BGR24\n", MOD_NAME);
 	} else if (w == (sh->bih->biSizeImage)/2) {
 	    priv->codec = IMGFMT_YV12;
-	    mp_msg (MSGT_DECVIDEO, MSGL_V, "[%s] codec choosen is YV12\n", MOD_NAME);
+	    mp_msg (MSGT_DECVIDEO, MSGL_V, "[%s] codec chosen is YV12\n", MOD_NAME);
 	} else {
 	    priv->codec = -1;
 	    mp_msg(MSGT_DECVIDEO,MSGL_ERR,"[%s] Unsupported out_fmt\n", MOD_NAME);

Modified: trunk/libmpdemux/aviheader.c
==============================================================================
--- trunk/libmpdemux/aviheader.c	Tue Aug  3 15:02:07 2010	(r31912)
+++ trunk/libmpdemux/aviheader.c	Tue Aug  3 17:55:17 2010	(r31913)
@@ -172,7 +172,7 @@ while(1){
     // required to produce the file (the format depends on the hardware used).
     case mmioFOURCC('I','S','H','P'): hdr="Sharpness";break;
     // ISRC - Identifies the name of the person or organization who
-    // suplied the original subject of the file; for example, "Try Research."
+    // supplied the original subject of the file; for example, "Try Research."
     case mmioFOURCC('I','S','R','C'): hdr="Source";break;
     // ISRF - Identifies the original form of the material that was digitized,
     // such as "slide," "paper," "map," and so on. This is not necessarily

Modified: trunk/libmpdemux/genres.h
==============================================================================
--- trunk/libmpdemux/genres.h	Tue Aug  3 15:02:07 2010	(r31912)
+++ trunk/libmpdemux/genres.h	Tue Aug  3 17:55:17 2010	(r31913)
@@ -99,7 +99,7 @@ const char * const genres[] = {
 "Native American",			/* 64 */
 "Cabaret",					/* 65 */
 "New Wave",					/* 66 */
-"Psychadelic",				/* 67 */
+"Psychedelic",				/* 67 */
 "Rave",						/* 68 */
 "Show Tunes",				/* 69 */
 "Trailer",					/* 70 */

Modified: trunk/libvo/vo_gl2.c
==============================================================================
--- trunk/libvo/vo_gl2.c	Tue Aug  3 15:02:07 2010	(r31912)
+++ trunk/libvo/vo_gl2.c	Tue Aug  3 17:55:17 2010	(r31913)
@@ -209,7 +209,7 @@ static int initTextures(void)
     mp_msg (MSGT_VO, MSGL_V, "[%dx%d] !\n", texture_width, texture_height);
 
     if(texture_width < 64 || texture_height < 64) {
-      mp_msg (MSGT_VO, MSGL_FATAL, "[gl2] Give up .. usable texture size not avaiable, or texture config error !\n");
+      mp_msg (MSGT_VO, MSGL_FATAL, "[gl2] Give up .. usable texture size not available, or texture config error !\n");
       return -1;
     }
   } while (texture_width > 1 && texture_height > 1);

Modified: trunk/libvo/vo_pnm.c
==============================================================================
--- trunk/libvo/vo_pnm.c	Tue Aug  3 15:02:07 2010	(r31912)
+++ trunk/libvo/vo_pnm.c	Tue Aug  3 17:55:17 2010	(r31913)
@@ -441,7 +441,7 @@ static void pnm_write_image(mp_image_t *
     FILE *outfile;
 
     if (!mpi) {
-        mp_msg(MSGT_VO, MSGL_ERR, "%s: No image data suplied to video output driver\n", info.short_name );
+        mp_msg(MSGT_VO, MSGL_ERR, "%s: No image data supplied to video output driver\n", info.short_name );
         exit_player(EXIT_ERROR);
     }
 

Modified: trunk/libvo/vo_xvmc.c
==============================================================================
--- trunk/libvo/vo_xvmc.c	Tue Aug  3 15:02:07 2010	(r31912)
+++ trunk/libvo/vo_xvmc.c	Tue Aug  3 17:55:17 2010	(r31913)
@@ -298,7 +298,7 @@ static int xvmc_find_surface_by_format(i
         /* check if adaptor number has been specified */
         if (xv_adaptor != -1 && xv_adaptor != i)
             continue;
-        mp_msg(MSGT_VO,MSGL_DBG3,"vo_xvmc: Quering adaptor #%d\n",i);
+        mp_msg(MSGT_VO,MSGL_DBG3,"vo_xvmc: Querying adaptor #%d\n",i);
         if( ai[i].type == 0 ) continue;// we need at least dummy type!
 //probing ports
         for(p=ai[i].base_id; p<ai[i].base_id+ai[i].num_ports; p++)
@@ -1071,7 +1071,7 @@ static int query_format(uint32_t format)
     mp_msg(MSGT_VO,MSGL_DBG4,"vo_xvmc: query_format=%X\n",format);
 
     if(!IMGFMT_IS_XVMC(format)) return 0;// no caps supported
-    mode_id = xvmc_find_surface_by_format(format, 16, 16, &qsurface_info, 1);//true=1 - quering
+    mode_id = xvmc_find_surface_by_format(format, 16, 16, &qsurface_info, 1);//true=1 - querying
 
     if( mode_id == 0 ) return 0;
 
@@ -1151,7 +1151,7 @@ static void check_osd_source(struct xvmc
 
     //If this is source surface, check does the OSD rendering is compleate
     if(src_rndr->state & AV_XVMC_STATE_OSD_SOURCE){
-        mp_msg(MSGT_VO,MSGL_DBG4,"vo_xvmc: OSD surface=%p quering\n",src_rndr);
+        mp_msg(MSGT_VO,MSGL_DBG4,"vo_xvmc: OSD surface=%p querying\n",src_rndr);
         osd_rndr = src_rndr->p_osd_target_surface_render;
         XvMCGetSurfaceStatus(mDisplay, osd_rndr->p_surface, &stat);
         if(!(stat & XVMC_RENDERING))

Modified: trunk/libvo/x11_common.c
==============================================================================
--- trunk/libvo/x11_common.c	Tue Aug  3 15:02:07 2010	(r31912)
+++ trunk/libvo/x11_common.c	Tue Aug  3 17:55:17 2010	(r31913)
@@ -248,7 +248,7 @@ void fstype_help(void)
     mp_msg(MSGT_VO, MSGL_INFO, "    %-15s %s\n", "below",
            "use _NETWM_STATE_BELOW hint if available");
     mp_msg(MSGT_VO, MSGL_INFO, "    %-15s %s\n", "fullscreen",
-           "use _NETWM_STATE_FULLSCREEN hint if availale");
+           "use _NETWM_STATE_FULLSCREEN hint if available");
     mp_msg(MSGT_VO, MSGL_INFO, "    %-15s %s\n", "stays_on_top",
            "use _NETWM_STATE_STAYS_ON_TOP hint if available");
     mp_msg(MSGT_VO, MSGL_INFO,

Modified: trunk/m_option.c
==============================================================================
--- trunk/m_option.c	Tue Aug  3 15:02:07 2010	(r31912)
+++ trunk/m_option.c	Tue Aug  3 17:55:17 2010	(r31913)
@@ -282,7 +282,7 @@ static char* print_double(const m_option
 
 const m_option_type_t m_option_type_double = {
   "Double",
-  "double precission floating point number or ratio (numerator[:/]denominator)",
+  "double precision floating point number or ratio (numerator[:/]denominator)",
   sizeof(double),
   0,
   parse_double,

Modified: trunk/stream/pnm.c
==============================================================================
--- trunk/stream/pnm.c	Tue Aug  3 15:02:07 2010	(r31912)
+++ trunk/stream/pnm.c	Tue Aug  3 17:55:17 2010	(r31913)
@@ -378,7 +378,7 @@ static int pnm_get_chunk(pnm_t *p,
     case MDPR_TAG:
     case CONT_TAG:
       if (chunk_size > max || chunk_size < PREAMBLE_SIZE) {
-        mp_msg(MSGT_OPEN, MSGL_ERR, "error: max chunk size exceded (max was 0x%04x)\n", max);
+        mp_msg(MSGT_OPEN, MSGL_ERR, "error: max chunk size exceeded (max was 0x%04x)\n", max);
 #ifdef LOG
         n=rm_read (p->s, &data[PREAMBLE_SIZE], 0x100 - PREAMBLE_SIZE);
         hexdump(data,n+PREAMBLE_SIZE);

Modified: trunk/stream/tvi_v4l.c
==============================================================================
--- trunk/stream/tvi_v4l.c	Tue Aug  3 15:02:07 2010	(r31912)
+++ trunk/stream/tvi_v4l.c	Tue Aug  3 17:55:17 2010	(r31913)
@@ -496,14 +496,14 @@ static int init(priv_t *priv)
     /* get capabilities (priv->capability is needed!) */
     if (ioctl(priv->video_fd, VIDIOCGCAP, &priv->capability) == -1)
     {
-        mp_msg(MSGT_TV, MSGL_ERR, "ioctl get capabilites failed: %s\n", strerror(errno));
+        mp_msg(MSGT_TV, MSGL_ERR, "ioctl get capabilities failed: %s\n", strerror(errno));
         goto err;
     }
 
     fcntl(priv->video_fd, F_SETFD, FD_CLOEXEC);
 
     mp_msg(MSGT_TV, MSGL_INFO, "Selected device: %s\n", priv->capability.name);
-    mp_msg(MSGT_TV, MSGL_INFO, " Capabilites: ");
+    mp_msg(MSGT_TV, MSGL_INFO, " Capabilities: ");
     for (i = 0; device_cap2name[i] != NULL; i++)
         if (priv->capability.type & (1 << i))
             mp_msg(MSGT_TV, MSGL_INFO, "%s ", device_cap2name[i]);
@@ -810,7 +810,7 @@ static int vbi_init(priv_t* priv,char* d
     }
 
     if(ioctl(vbi_fd,VIDIOCGCAP,&cap)<0){
-        mp_msg(MSGT_TV,MSGL_ERR,"vbi: Query capatibilities failed for %s\n",priv->vbi_dev);
+        mp_msg(MSGT_TV,MSGL_ERR,"vbi: Query capabilities failed for %s\n",priv->vbi_dev);
         close(vbi_fd);
         return  TVI_CONTROL_FALSE;
     }
@@ -1397,7 +1397,7 @@ static int control(priv_t *priv, int cmd
             }
 
             if (ioctl(priv->video_fd, VIDIOCGCAP, &priv->capability) == -1) {
-                mp_msg(MSGT_TV, MSGL_ERR, "ioctl get capabilites failed: %s\n", strerror(errno));
+                mp_msg(MSGT_TV, MSGL_ERR, "ioctl get capabilities failed: %s\n", strerror(errno));
                 return TVI_CONTROL_FALSE;
             }
 

Modified: trunk/stream/tvi_v4l2.c
==============================================================================
--- trunk/stream/tvi_v4l2.c	Tue Aug  3 15:02:07 2010	(r31912)
+++ trunk/stream/tvi_v4l2.c	Tue Aug  3 17:55:17 2010	(r31913)
@@ -609,7 +609,7 @@ static int vbi_init(priv_t* priv,char* d
     }
 
     if(ioctl(vbi_fd,VIDIOC_QUERYCAP,&cap)<0){
-        mp_msg(MSGT_TV,MSGL_ERR,"vbi: Query capatibilities failed for %s\n",priv->vbi_dev);
+        mp_msg(MSGT_TV,MSGL_ERR,"vbi: Query capabilities failed for %s\n",priv->vbi_dev);
         close(vbi_fd);
         return  TVI_CONTROL_FALSE;
     }
@@ -1263,7 +1263,7 @@ static int init(priv_t *priv)
                 (priv->tuner.rxsubchans & V4L2_TUNER_SUB_LANG1)  ? " LANG1"  : "",
                 (priv->tuner.rxsubchans & V4L2_TUNER_SUB_LANG2)  ? " LANG2"  : "");
     }
-    mp_msg(MSGT_TV, MSGL_INFO, " Capabilites:%s%s%s%s%s%s%s%s%s%s%s\n",
+    mp_msg(MSGT_TV, MSGL_INFO, " Capabilities:%s%s%s%s%s%s%s%s%s%s%s\n",
            priv->capability.capabilities & V4L2_CAP_VIDEO_CAPTURE?
            "  video capture": "",
            priv->capability.capabilities & V4L2_CAP_VIDEO_OUTPUT?

Modified: trunk/vidix/mga_vid.c
==============================================================================
--- trunk/vidix/mga_vid.c	Tue Aug  3 15:02:07 2010	(r31912)
+++ trunk/vidix/mga_vid.c	Tue Aug  3 17:55:17 2010	(r31913)
@@ -1149,7 +1149,7 @@ card_found:
 	probed = 1;
 	memcpy(&pci_info, &lst[i], sizeof(pciinfo_t));
 
-	mga_cap.device_id = pci_info.device; /* set device id in capabilites */
+	mga_cap.device_id = pci_info.device; /* set device id in capabilities */
 
 	return 0;
 }

Modified: trunk/vidix/pci.db
==============================================================================
--- trunk/vidix/pci.db	Tue Aug  3 15:02:07 2010	(r31912)
+++ trunk/vidix/pci.db	Tue Aug  3 17:55:17 2010	(r31913)
@@ -6067,7 +6067,7 @@ v	1137	Cisco Systems Inc	0
 v	1138	Ziatech Corporation	0
 d	11388905	8905 [STD 32 Bridge]	0
 v	1139	Dynamic Pictures, Inc	0
-d	11390001	VGA Compatable 3D Graphics	0
+d	11390001	VGA Compatible 3D Graphics	0
 v	113a	FWB Inc	0
 v	113b	Network Computing Devices	0
 v	113c	Cyclone Microsystems, Inc.	0
@@ -9437,9 +9437,9 @@ d	14f20122	EV1000 Serial port	0
 d	14f20123	EV1000 Keyboard controller	0
 d	14f20124	EV1000 Mouse controller	0
 v	14f3	BroadLogic	0
-d	14f32030	2030 DVB-S Satellite Reciever	0
-d	14f32050	2050 DVB-T Terrestrial (Cable) Reciever	0
-d	14f32060	2060 ATSC Terrestrial (Cable) Reciever	0
+d	14f32030	2030 DVB-S Satellite Receiver	0
+d	14f32050	2050 DVB-T Terrestrial (Cable) Receiver	0
+d	14f32060	2060 ATSC Terrestrial (Cable) Receiver	0
 v	14f4	TOKYO Electronic Industry CO Ltd	0
 v	14f5	SOPAC Ltd	0
 v	14f6	COYOTE Technologies LLC	0
@@ -12580,7 +12580,7 @@ v	8401	TRENDware International Inc.	0
 v	8686	ScaleMP	0
 d	86861010	vSMPowered system controller [vSMP CTL]	0
 v	8800	Trigem Computer Inc.	0
-d	88002008	Video assistent component	0
+d	88002008	Video assistant component	0
 v	8866	T-Square Design Inc.	0
 v	8888	Silicon Magic	0
 v	8912	TRX	0


More information about the MPlayer-cvslog mailing list