[FFmpeg-cvslog] pan: reindent after remap commit.
Clément Bœsch
git at videolan.org
Tue Jan 24 10:44:36 CET 2012
ffmpeg | branch: master | Clément Bœsch <clement.boesch at smartjog.com> | Mon Jan 23 11:27:11 2012 +0100| [94dc4a504638098a9e6a34ef895ba9f28534d445] | committer: Clément Bœsch
pan: reindent after remap commit.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94dc4a504638098a9e6a34ef895ba9f28534d445
---
libavfilter/af_pan.c | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
index 741e76a..2da5079 100644
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@@ -231,12 +231,12 @@ static int query_formats(AVFilterContext *ctx)
avfilter_set_common_packing_formats(ctx, avfilter_make_all_packing_formats());
pan->filter_samples = filter_samples_channel_mapping;
} else {
- const enum AVSampleFormat sample_fmts[] = {AV_SAMPLE_FMT_S16, -1};
- const int packing_fmts[] = {AVFILTER_PACKED, -1};
+ const enum AVSampleFormat sample_fmts[] = {AV_SAMPLE_FMT_S16, -1};
+ const int packing_fmts[] = {AVFILTER_PACKED, -1};
- avfilter_set_common_sample_formats (ctx, avfilter_make_format_list(sample_fmts));
- avfilter_set_common_packing_formats(ctx, avfilter_make_format_list(packing_fmts));
- pan->filter_samples = filter_samples_panning;
+ avfilter_set_common_sample_formats (ctx, avfilter_make_format_list(sample_fmts));
+ avfilter_set_common_packing_formats(ctx, avfilter_make_format_list(packing_fmts));
+ pan->filter_samples = filter_samples_panning;
}
// inlink supports any channel layout
@@ -307,23 +307,23 @@ static int config_props(AVFilterLink *link)
if (r < 0)
return r;
} else {
- // renormalize
- for (i = 0; i < pan->nb_output_channels; i++) {
- if (!((pan->need_renorm >> i) & 1))
- continue;
- t = 0;
- for (j = 0; j < pan->nb_input_channels; j++)
- t += pan->gain.d[i][j];
- if (t > -1E-5 && t < 1E-5) {
- // t is almost 0 but not exactly, this is probably a mistake
- if (t)
- av_log(ctx, AV_LOG_WARNING,
- "Degenerate coefficients while renormalizing\n");
- continue;
+ // renormalize
+ for (i = 0; i < pan->nb_output_channels; i++) {
+ if (!((pan->need_renorm >> i) & 1))
+ continue;
+ t = 0;
+ for (j = 0; j < pan->nb_input_channels; j++)
+ t += pan->gain.d[i][j];
+ if (t > -1E-5 && t < 1E-5) {
+ // t is almost 0 but not exactly, this is probably a mistake
+ if (t)
+ av_log(ctx, AV_LOG_WARNING,
+ "Degenerate coefficients while renormalizing\n");
+ continue;
+ }
+ for (j = 0; j < pan->nb_input_channels; j++)
+ pan->gain.d[i][j] /= t;
}
- for (j = 0; j < pan->nb_input_channels; j++)
- pan->gain.d[i][j] /= t;
- }
}
// summary
for (i = 0; i < pan->nb_output_channels; i++) {
More information about the ffmpeg-cvslog
mailing list