@@ -109,10 +109,10 @@ static void fill_quantization_matrices(AVCodecContext *avctx, | |||||
qm->bNewQmatrix[i] = 1; | qm->bNewQmatrix[i] = 1; | ||||
for (i = 0; i < 64; i++) { | for (i = 0; i < 64; i++) { | ||||
int n = s->dsp.idct_permutation[ff_zigzag_direct[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]; | |||||
} | } | ||||
} | } | ||||
@@ -58,7 +58,7 @@ HPEL_FILTER(16, sse2) | |||||
void ff_diracdsp_init_mmx(DiracDSPContext* c) | void ff_diracdsp_init_mmx(DiracDSPContext* c) | ||||
{ | { | ||||
int mm_flags = av_get_cpu_flags();; | |||||
int mm_flags = av_get_cpu_flags(); | |||||
#if HAVE_YASM | #if HAVE_YASM | ||||
c->add_dirac_obmc[0] = ff_add_dirac_obmc8_mmx; | c->add_dirac_obmc[0] = ff_add_dirac_obmc8_mmx; | ||||
@@ -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) | void ff_spatial_idwt_init_mmx(DWTContext *d, enum dwt_type type) | ||||
{ | { | ||||
#if HAVE_YASM | #if HAVE_YASM | ||||
int mm_flags = av_get_cpu_flags();; | |||||
int mm_flags = av_get_cpu_flags(); | |||||
#if !ARCH_X86_64 | #if !ARCH_X86_64 | ||||
if (!(mm_flags & AV_CPU_FLAG_MMX)) | if (!(mm_flags & AV_CPU_FLAG_MMX)) | ||||
@@ -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_P] = INTERLACE_TYPE_P; | ||||
select->var_values[VAR_INTERLACE_TYPE_T] = INTERLACE_TYPE_T; | 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; | return 0; | ||||
} | } | ||||
@@ -543,7 +543,7 @@ static int recheck_discard_flags(AVFormatContext *s, int first) | |||||
/* Check if any new streams are needed */ | /* Check if any new streams are needed */ | ||||
for (i = 0; i < c->n_variants; i++) | 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++) { | for (i = 0; i < s->nb_streams; i++) { | ||||
AVStream *st = s->streams[i]; | AVStream *st = s->streams[i]; | ||||
@@ -284,7 +284,7 @@ static void write_sync(AVFormatContext *s) | |||||
AVIOContext *pb = s->pb; | AVIOContext *pb = s->pb; | ||||
WtvContext *wctx = s->priv_data; | WtvContext *wctx = s->priv_data; | ||||
int64_t last_chunk_pos = wctx->last_chunk_pos; | 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_chunk_header(s, &sync_guid, 0x18, 0); | ||||
write_pad(pb, 24); | write_pad(pb, 24); | ||||