Fix ;;

Originally committed as revision 12153 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffplay.c b/ffplay.c
index 1cfb54d9766f610e3207bcf4800cc90a7532383d..915c257103ea1bb150ecc85b5d9a6b6ffd755171 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -657,7 +657,7 @@ static void video_image_display(VideoState *is)
             aspect_ratio = 0;
         else
             aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio)
-                * is->video_st->codec->width / is->video_st->codec->height;;
+                * is->video_st->codec->width / is->video_st->codec->height;
         if (aspect_ratio <= 0.0)
             aspect_ratio = (float)is->video_st->codec->width /
                 (float)is->video_st->codec->height;

diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index 475c343e699b7603254c6db1c6aa0c7d99052c16..81ed55e3542d9388ec92d1599e027c34b516f2bf 100644 (file)
--- a/libavcodec/flac.c
+++ b/libavcodec/flac.c
@@ -721,7 +721,7 @@ static int flac_decode_frame(AVCodecContext *avctx,
 
 //    s->last_blocksize = s->blocksize;
 end:
-    i= (get_bits_count(&s->gb)+7)/8;;
+    i= (get_bits_count(&s->gb)+7)/8;
     if(i > buf_size){
         av_log(s->avctx, AV_LOG_ERROR, "overread: %d\n", i - buf_size);
         s->bitstream_size=0;

diff --git a/libavcodec/g726.c b/libavcodec/g726.c
index 912c38f7fc2ae75c721b47540d9cfd89d5d12023..d0073c1b4d307f13f38c5834567c1adb0236f476 100644 (file)
--- a/libavcodec/g726.c
+++ b/libavcodec/g726.c
@@ -387,7 +387,7 @@ static int g726_decode_frame(AVCodecContext *avctx,
     mask = (1<<c->code_size) - 1;
     init_get_bits(&gb, buf, buf_size * 8);
     if (c->bits_left) {
-        int s = c->code_size - c->bits_left;;
+        int s = c->code_size - c->bits_left;
         code = (c->bit_buffer << s) | get_bits(&gb, s);
         *samples++ = g726_decode(&c->c, code & mask);
     }

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 41e434845263a4f3c06a0927bb05de825a3b7d20..7f37cb46af44d0c7f226dff2ef0e9fca08b594e8 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2919,7 +2919,7 @@ static int fill_default_ref_list(H264Context *h){
                 if(sel != PICT_FRAME) continue;
 
                 frame_list[ list ][index  ]= *h->long_ref[i];
-                frame_list[ list ][index++].pic_id= i;;
+                frame_list[ list ][index++].pic_id= i;
             }
             len[list] = index;
         }
@@ -2963,7 +2963,7 @@ static int fill_default_ref_list(H264Context *h){
             sel = h->long_ref[i]->reference | structure_sel;
             if(sel != PICT_FRAME) continue;
             frame_list[0][index  ]= *h->long_ref[i];
-            frame_list[0][index++].pic_id= i;;
+            frame_list[0][index++].pic_id= i;
         }
 
         if (FIELD_PICTURE)
@@ -5498,7 +5498,7 @@ static void decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int
             if( !qmul ) {
                 block[j] = get_cabac_bypass_sign( CC, -1);
             }else{
-                block[j] = (get_cabac_bypass_sign( CC, -qmul[j]) + 32) >> 6;;
+                block[j] = (get_cabac_bypass_sign( CC, -qmul[j]) + 32) >> 6;
             }
 
             abslevel1++;

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 6b14339db062d8d71affb6aa9100ca51f0f53ff9..76a17d56d5fb2cdd0ba1db5a59459adbe03261c5 100644 (file)
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1097,8 +1097,8 @@ static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h
         for(y= 0; y <= ey; y++){
             x = (y*f)>>16;
             fr= (y*f)&0xFFFF;
-            buf[y*stride + x  ]+= (color*(0x10000-fr))>>16;;
-            buf[y*stride + x+1]+= (color*         fr )>>16;;
+            buf[y*stride + x  ]+= (color*(0x10000-fr))>>16;
+            buf[y*stride + x+1]+= (color*         fr )>>16;
         }
     }
 }
@@ -2129,7 +2129,7 @@ void ff_draw_horiz_band(MpegEncContext *s, int y, int h){
             offset[2]=
             offset[3]= 0;
         }else{
-            offset[0]= y * s->linesize;;
+            offset[0]= y * s->linesize;
             offset[1]=
             offset[2]= (y >> s->chroma_y_shift) * s->uvlinesize;
             offset[3]= 0;

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 6cb7fbe14333c6651e80b51c777f66a533c2b18e..2beb93fb39540757d64443af6571e200b23044b0 100644 (file)
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -473,7 +473,7 @@ static int init_block_mapping(Vp3DecodeContext *s)
     current_width = -1;
     current_height = 0;
     superblock_row_inc = s->macroblock_width -
-        (s->y_superblock_width * 2 - s->macroblock_width);;
+        (s->y_superblock_width * 2 - s->macroblock_width);
     hilbert = hilbert_walk_mb;
     mapping_index = 0;
     current_macroblock = -1;

diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c
index 8a10909b9a812f01d5ec78ac0c2a60122f71f1f4..8e70143f470bc15f02b8073031fe357d0c159723 100644 (file)
--- a/libavcodec/vqavideo.c
+++ b/libavcodec/vqavideo.c
@@ -133,7 +133,7 @@ static int vqa_decode_init(AVCodecContext *avctx)
 {
     VqaContext *s = avctx->priv_data;
     unsigned char *vqa_header;
-    int i, j, codebook_index;;
+    int i, j, codebook_index;
 
     s->avctx = avctx;
     avctx->pix_fmt = PIX_FMT_PAL8;

diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index 3cea07fef9ed92af6430c5856e68321773cb51bc..5b149a7ca5a289d2be2072ac3c823dd6eca71d5a 100644 (file)
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -107,7 +107,7 @@ static int film_read_header(AVFormatContext *s,
         /* normal Saturn .cpk files; 32-byte header */
         if (get_buffer(pb, scratch, 32) != 32)
             return AVERROR(EIO);
-        film->audio_samplerate = AV_RB16(&scratch[24]);;
+        film->audio_samplerate = AV_RB16(&scratch[24]);
         film->audio_channels = scratch[21];
         film->audio_bits = scratch[22];
         if (film->audio_bits == 8)