summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/3dfx.h2
-rw-r--r--libmpdemux/demux_ts.c2
-rw-r--r--libmpdemux/muxer_mpeg.c2
-rw-r--r--libvo/vo_xvmc.c2
-rw-r--r--loader/dshow/DS_AudioDecoder.c2
-rw-r--r--stream/stream.h2
-rw-r--r--stream/stream_dvdnav.c2
-rw-r--r--stream/tvi_dshow.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/drivers/3dfx.h b/drivers/3dfx.h
index 99d6ef0a75..123541c865 100644
--- a/drivers/3dfx.h
+++ b/drivers/3dfx.h
@@ -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;
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index 94de6fbc28..3d15281644 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -322,7 +322,7 @@ static void ts_add_stream(demuxer_t * demuxer, ES_stream_t *es)
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;
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c
index 7e88686483..a4504caa99 100644
--- a/libmpdemux/muxer_mpeg.c
+++ b/libmpdemux/muxer_mpeg.c
@@ -538,7 +538,7 @@ static void write_mpeg2_scr(unsigned char *b, uint64_t ts)
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;
diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c
index ad18fb3231..ac06f668ad 100644
--- a/libvo/vo_xvmc.c
+++ b/libvo/vo_xvmc.c
@@ -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];
diff --git a/loader/dshow/DS_AudioDecoder.c b/loader/dshow/DS_AudioDecoder.c
index 2ac48cd25e..645c8b517b 100644
--- a/loader/dshow/DS_AudioDecoder.c
+++ b/loader/dshow/DS_AudioDecoder.c
@@ -184,7 +184,7 @@ int DS_AudioDecoder_GetSrcSize(DS_AudioDecoder *this, int dest_size)
{
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;
diff --git a/stream/stream.h b/stream/stream.h
index 686288071f..484c6a2232 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -224,7 +224,7 @@ inline static int stream_read(stream_t *s,char* mem,int total){
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
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index 403016b372..85d86713c2 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -733,7 +733,7 @@ int mp_dvdnav_aid_from_lang(stream_t *stream, unsigned char *language) {
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]);
diff --git a/stream/tvi_dshow.c b/stream/tvi_dshow.c
index e06f4dc346..4a524852cd 100644
--- a/stream/tvi_dshow.c
+++ b/stream/tvi_dshow.c
@@ -3312,7 +3312,7 @@ static int control(priv_t * priv, int cmd, void *arg)
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