Mercurial > mplayer.hg

changeset 28576:a6b506faeb34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace double semicolon by single semicolon.
author diego
date Mon, 16 Feb 2009 02:00:29 +0000
parents 109923244a8e
children 4f37b9cb7343
files 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
diffstat 8 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/drivers/3dfx.h	Mon Feb 16 00:29:25 2009 +0000
+++ b/drivers/3dfx.h	Mon Feb 16 02:00:29 2009 +0000
@@ -66,7 +66,7 @@
   uint32_t lineStipple;
   uint32_t lineStyle;
   uint32_t pattern0Alias;
-  uint32_t pattern1Alias;;
+  uint32_t pattern1Alias;
   uint32_t clip1Min;
   uint32_t clip1Max;
   uint32_t srcFormat;
--- a/libmpdemux/demux_ts.c	Mon Feb 16 00:29:25 2009 +0000
+++ b/libmpdemux/demux_ts.c	Mon Feb 16 02:00:29 2009 +0000
@@ -322,7 +322,7 @@
 		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;
--- a/libmpdemux/muxer_mpeg.c	Mon Feb 16 00:29:25 2009 +0000
+++ b/libmpdemux/muxer_mpeg.c	Mon Feb 16 02:00:29 2009 +0000
@@ -538,7 +538,7 @@
 	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;
 	
--- a/libvo/vo_xvmc.c	Mon Feb 16 00:29:25 2009 +0000
+++ b/libvo/vo_xvmc.c	Mon Feb 16 02:00:29 2009 +0000
@@ -529,7 +529,7 @@
       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];
--- a/loader/dshow/DS_AudioDecoder.c	Mon Feb 16 00:29:25 2009 +0000
+++ b/loader/dshow/DS_AudioDecoder.c	Mon Feb 16 02:00:29 2009 +0000
@@ -184,7 +184,7 @@
 {
     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;
--- a/stream/stream.h	Mon Feb 16 00:29:25 2009 +0000
+++ b/stream/stream.h	Mon Feb 16 02:00:29 2009 +0000
@@ -224,7 +224,7 @@
 
 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
--- a/stream/stream_dvdnav.c	Mon Feb 16 00:29:25 2009 +0000
+++ b/stream/stream_dvdnav.c	Mon Feb 16 02:00:29 2009 +0000
@@ -733,7 +733,7 @@
   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]);
--- a/stream/tvi_dshow.c	Mon Feb 16 00:29:25 2009 +0000
+++ b/stream/tvi_dshow.c	Mon Feb 16 02:00:29 2009 +0000
@@ -3312,7 +3312,7 @@
 	    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