[MPlayer-cvslog] r28611 - in trunk: drivers/3dfx.h libmpdemux/demux_ts.c libmpdemux/muxer_mpeg.c libvo/vo_xvmc.c loader/dshow/DS_AudioDecoder.c stream/stream.h stream/stream_dvdnav.c stream/tvi_dshow.c

[diego]

Author: diego
Date: Mon Feb 16 03:00:29 2009
New Revision: 28611

Log:
Replace double semicolon by single semicolon.

Modified:
   trunk/drivers/3dfx.h
   trunk/libmpdemux/demux_ts.c
   trunk/libmpdemux/muxer_mpeg.c
   trunk/libvo/vo_xvmc.c
   trunk/loader/dshow/DS_AudioDecoder.c
   trunk/stream/stream.h
   trunk/stream/stream_dvdnav.c
   trunk/stream/tvi_dshow.c

Modified: trunk/drivers/3dfx.h
==============================================================================
--- trunk/drivers/3dfx.h	Mon Feb 16 01:29:25 2009	(r28610)
+++ trunk/drivers/3dfx.h	Mon Feb 16 03:00:29 2009	(r28611)
@@ -66,7 +66,7 @@ struct voodoo_2d_reg_t {
   uint32_t lineStipple;
   uint32_t lineStyle;
   uint32_t pattern0Alias;
-  uint32_t pattern1Alias;;
+  uint32_t pattern1Alias;
   uint32_t clip1Min;
   uint32_t clip1Max;
   uint32_t srcFormat;

Modified: trunk/libmpdemux/demux_ts.c
==============================================================================
--- trunk/libmpdemux/demux_ts.c	Mon Feb 16 01:29:25 2009	(r28610)
+++ trunk/libmpdemux/demux_ts.c	Mon Feb 16 03:00:29 2009	(r28611)
@@ -322,7 +322,7 @@ static void ts_add_stream(demuxer_t * de
 		sh_video_t *sh = new_sh_video_vid(demuxer, priv->last_vid, es->pid);
 		if(sh)
 		{
-			sh->format = IS_VIDEO(es->type) ? es->type : es->subtype;;
+			sh->format = IS_VIDEO(es->type) ? es->type : es->subtype;
 			sh->ds = demuxer->video;
 
 			priv->ts.streams[es->pid].id = priv->last_vid;

Modified: trunk/libmpdemux/muxer_mpeg.c
==============================================================================
--- trunk/libmpdemux/muxer_mpeg.c	Mon Feb 16 01:29:25 2009	(r28610)
+++ trunk/libmpdemux/muxer_mpeg.c	Mon Feb 16 03:00:29 2009	(r28611)
@@ -538,7 +538,7 @@ static void write_mpeg2_scr(unsigned cha
 	scr_ext = ts % 300ULL;
 	ts /= 300ULL;
 	ts &= 0x1FFFFFFFFULL;	//33 bits
-	t1 = (ts >> 30) & 0x7;;
+	t1 = (ts >> 30) & 0x7;
 	t2 = (ts >> 15) & 0x7fff;
 	t3 = ts & 0x7fff;
 	

Modified: trunk/libvo/vo_xvmc.c
==============================================================================
--- trunk/libvo/vo_xvmc.c	Mon Feb 16 01:29:25 2009	(r28610)
+++ trunk/libvo/vo_xvmc.c	Mon Feb 16 03:00:29 2009	(r28611)
@@ -529,7 +529,7 @@ int vm = flags & VOFLAG_MODESWITCHING;
       surface_render[i].data_blocks = data_blocks.blocks;
       surface_render[i].mv_blocks = mv_blocks.macro_blocks;
       surface_render[i].allocated_mv_blocks = numblocks;
-      surface_render[i].allocated_data_blocks = numblocks*blocks_per_macroblock;;
+      surface_render[i].allocated_data_blocks = numblocks*blocks_per_macroblock;
       surface_render[i].idct = (surface_info.mc_type & XVMC_IDCT) == XVMC_IDCT;
       surface_render[i].unsigned_intra = (surface_info.flags & XVMC_INTRA_UNSIGNED) == XVMC_INTRA_UNSIGNED;
       surface_render[i].p_surface = &surface_array[i];

Modified: trunk/loader/dshow/DS_AudioDecoder.c
==============================================================================
--- trunk/loader/dshow/DS_AudioDecoder.c	Mon Feb 16 01:29:25 2009	(r28610)
+++ trunk/loader/dshow/DS_AudioDecoder.c	Mon Feb 16 03:00:29 2009	(r28611)
@@ -184,7 +184,7 @@ int DS_AudioDecoder_GetSrcSize(DS_AudioD
 {
     double efficiency =(double) this->in_fmt.nAvgBytesPerSec
 	/ (this->in_fmt.nSamplesPerSec*this->in_fmt.nBlockAlign);
-    int frames = (int)(dest_size*efficiency);;
+    int frames = (int)(dest_size*efficiency);
     
     if (frames < 1)
 	frames = 1;

Modified: trunk/stream/stream.h
==============================================================================
--- trunk/stream/stream.h	Mon Feb 16 01:29:25 2009	(r28610)
+++ trunk/stream/stream.h	Mon Feb 16 03:00:29 2009	(r28611)
@@ -224,7 +224,7 @@ inline static int stream_read(stream_t *
 
 inline static unsigned char* stream_read_line(stream_t *s,unsigned char* mem, int max) {
   int len;
-  unsigned char* end,*ptr = mem;;
+  unsigned char* end,*ptr = mem;
   do {
     len = s->buf_len-s->buf_pos;
     // try to fill the buffer

Modified: trunk/stream/stream_dvdnav.c
==============================================================================
--- trunk/stream/stream_dvdnav.c	Mon Feb 16 01:29:25 2009	(r28610)
+++ trunk/stream/stream_dvdnav.c	Mon Feb 16 03:00:29 2009	(r28611)
@@ -733,7 +733,7 @@ int mp_dvdnav_aid_from_lang(stream_t *st
   dvdnav_priv_t * priv = stream->priv;
   int k;
   uint8_t lg;
-  uint16_t lang, lcode;;
+  uint16_t lang, lcode;
 
   while(language && strlen(language)>=2) {
     lcode = (language[0] << 8) | (language[1]);

Modified: trunk/stream/tvi_dshow.c
==============================================================================
--- trunk/stream/tvi_dshow.c	Mon Feb 16 01:29:25 2009	(r28610)
+++ trunk/stream/tvi_dshow.c	Mon Feb 16 03:00:29 2009	(r28611)
@@ -3312,7 +3312,7 @@ static int control(priv_t * priv, int cm
 	    if (!priv->chains[1]->arpmt[0])
 		return TVI_CONTROL_FALSE;
 
-	    samplerate = *(int *) arg;;
+	    samplerate = *(int *) arg;
 
 	    for (i = 0; priv->chains[1]->arpmt[i]; i++)
 		if (check_audio_format