From: nu774 Date: Sat, 19 Jan 2013 09:19:10 +0000 (+0900) Subject: retab X-Git-Tag: v0.1.4~3 X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=7b1f2136183f13cfdc83cc387134688ad07325f5;p=fdkaac.git retab --- diff --git a/src/compat_win32.c b/src/compat_win32.c index d640baf..23edd91 100644 --- a/src/compat_win32.c +++ b/src/compat_win32.c @@ -82,7 +82,7 @@ void aacenc_free_mainargs(void) { char **p = __aacenc_argv__; for (; *p; ++p) - free(*p); + free(*p); free(__aacenc_argv__); } diff --git a/src/m4af.c b/src/m4af.c index dc44e04..fb4f8d6 100644 --- a/src/m4af.c +++ b/src/m4af.c @@ -1142,7 +1142,7 @@ int m4af_finalize(m4af_writer_t *ctx) track = ctx->track + i; if (track->duration) { int64_t track_size = 0; - unsigned j; + unsigned j; for (j = 0; j < track->num_chunks; ++j) track_size += track->chunk_table[j].size; track->avgBitrate = @@ -1176,15 +1176,15 @@ void m4af_teardown(m4af_writer_t **ctxp) m4af_writer_t *ctx = *ctxp; m4af_track_t *track; for (i = 0; i < ctx->num_tracks; ++i) { - track = ctx->track + i; - if (track->decSpecificInfo) - m4af_free(track->decSpecificInfo); - if (track->sample_table) - m4af_free(track->sample_table); - if (track->chunk_table) - m4af_free(track->chunk_table); - if (track->chunk_buffer) - m4af_free(track->chunk_buffer); + track = ctx->track + i; + if (track->decSpecificInfo) + m4af_free(track->decSpecificInfo); + if (track->sample_table) + m4af_free(track->sample_table); + if (track->chunk_table) + m4af_free(track->chunk_table); + if (track->chunk_buffer) + m4af_free(track->chunk_buffer); } if (ctx->itmf_table) m4af_free_itmf_table(ctx); diff --git a/src/main.c b/src/main.c index 5221387..e97c611 100644 --- a/src/main.c +++ b/src/main.c @@ -770,10 +770,10 @@ int main(int argc, char **argv) if (!params.transport_format) { uint32_t scale; unsigned framelen = aacinfo.frameLength; - int sbr_mode = aacenc_is_sbr_active((aacenc_param_t*)¶ms); - int sig_mode = aacEncoder_GetParam(encoder, AACENC_SIGNALING_MODE); - if (sbr_mode && !sig_mode) - downsampled_timescale = 1; + int sbr_mode = aacenc_is_sbr_active((aacenc_param_t*)¶ms); + int sig_mode = aacEncoder_GetParam(encoder, AACENC_SIGNALING_MODE); + if (sbr_mode && !sig_mode) + downsampled_timescale = 1; scale = sample_format->sample_rate >> downsampled_timescale; if ((m4af = m4af_create(M4AF_CODEC_MP4A, scale, &m4af_io, ofp)) < 0) goto END; @@ -787,7 +787,7 @@ int main(int argc, char **argv) goto END; if (m4af) { uint32_t delay = aacinfo.encoderDelay; - int64_t frames_read = wav_get_position(wavf); + int64_t frames_read = wav_get_position(wavf); uint32_t padding = frame_count * aacinfo.frameLength - frames_read - aacinfo.encoderDelay; m4af_set_priming(m4af, 0, delay >> downsampled_timescale,