From 4da45aff28de618c3be566094952bc19da9c9118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Wed, 16 Nov 2011 07:48:23 +0100 Subject: [PATCH] cleanup: remove various double end ';' all over the code. --- libavcodec/dxva2_mpeg2.c | 8 ++++---- libavcodec/x86/diracdsp_mmx.c | 2 +- libavcodec/x86/dwt.c | 2 +- libavfilter/vf_select.c | 2 +- libavformat/applehttp.c | 2 +- libavformat/wtvenc.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/dxva2_mpeg2.c b/libavcodec/dxva2_mpeg2.c index 02065744ce..6ac1cda4ed 100644 --- a/libavcodec/dxva2_mpeg2.c +++ b/libavcodec/dxva2_mpeg2.c @@ -109,10 +109,10 @@ static void fill_quantization_matrices(AVCodecContext *avctx, qm->bNewQmatrix[i] = 1; for (i = 0; i < 64; i++) { int n = s->dsp.idct_permutation[ff_zigzag_direct[i]]; - qm->Qmatrix[0][i] = s->intra_matrix[n];; - qm->Qmatrix[1][i] = s->inter_matrix[n];; - qm->Qmatrix[2][i] = s->chroma_intra_matrix[n];; - qm->Qmatrix[3][i] = s->chroma_inter_matrix[n];; + qm->Qmatrix[0][i] = s->intra_matrix[n]; + qm->Qmatrix[1][i] = s->inter_matrix[n]; + qm->Qmatrix[2][i] = s->chroma_intra_matrix[n]; + qm->Qmatrix[3][i] = s->chroma_inter_matrix[n]; } } diff --git a/libavcodec/x86/diracdsp_mmx.c b/libavcodec/x86/diracdsp_mmx.c index a1f1489045..a343bdd2af 100644 --- a/libavcodec/x86/diracdsp_mmx.c +++ b/libavcodec/x86/diracdsp_mmx.c @@ -58,7 +58,7 @@ HPEL_FILTER(16, sse2) void ff_diracdsp_init_mmx(DiracDSPContext* c) { - int mm_flags = av_get_cpu_flags();; + int mm_flags = av_get_cpu_flags(); #if HAVE_YASM c->add_dirac_obmc[0] = ff_add_dirac_obmc8_mmx; diff --git a/libavcodec/x86/dwt.c b/libavcodec/x86/dwt.c index daa7331926..45b3b34ebe 100644 --- a/libavcodec/x86/dwt.c +++ b/libavcodec/x86/dwt.c @@ -134,7 +134,7 @@ static void horizontal_compose_dd97i_ssse3(IDWTELEM *b, IDWTELEM *tmp, int w) void ff_spatial_idwt_init_mmx(DWTContext *d, enum dwt_type type) { #if HAVE_YASM - int mm_flags = av_get_cpu_flags();; + int mm_flags = av_get_cpu_flags(); #if !ARCH_X86_64 if (!(mm_flags & AV_CPU_FLAG_MMX)) diff --git a/libavfilter/vf_select.c b/libavfilter/vf_select.c index 18f1b4f768..5cbe663ea1 100644 --- a/libavfilter/vf_select.c +++ b/libavfilter/vf_select.c @@ -157,7 +157,7 @@ static int config_input(AVFilterLink *inlink) select->var_values[VAR_INTERLACE_TYPE_P] = INTERLACE_TYPE_P; select->var_values[VAR_INTERLACE_TYPE_T] = INTERLACE_TYPE_T; - select->var_values[VAR_INTERLACE_TYPE_B] = INTERLACE_TYPE_B;; + select->var_values[VAR_INTERLACE_TYPE_B] = INTERLACE_TYPE_B; return 0; } diff --git a/libavformat/applehttp.c b/libavformat/applehttp.c index dc5bc07a78..7c41d9893c 100644 --- a/libavformat/applehttp.c +++ b/libavformat/applehttp.c @@ -543,7 +543,7 @@ static int recheck_discard_flags(AVFormatContext *s, int first) /* Check if any new streams are needed */ for (i = 0; i < c->n_variants; i++) - c->variants[i]->cur_needed = 0;; + c->variants[i]->cur_needed = 0; for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c index 71ff2081bc..3fdda94ffb 100644 --- a/libavformat/wtvenc.c +++ b/libavformat/wtvenc.c @@ -284,7 +284,7 @@ static void write_sync(AVFormatContext *s) AVIOContext *pb = s->pb; WtvContext *wctx = s->priv_data; int64_t last_chunk_pos = wctx->last_chunk_pos; - wctx->sync_pos = avio_tell(pb) - wctx->timeline_start_pos;; + wctx->sync_pos = avio_tell(pb) - wctx->timeline_start_pos; write_chunk_header(s, &sync_guid, 0x18, 0); write_pad(pb, 24);