[FFmpeg-cvslog] lavr: cosmetics: reindent
Justin Ruggles
git at videolan.org
Tue Jan 8 13:14:08 CET 2013
ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Fri Dec 21 16:31:26 2012 -0500| [1ccf82cfd85ce870297599c18292484004d2145f] | committer: Justin Ruggles
lavr: cosmetics: reindent
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ccf82cfd85ce870297599c18292484004d2145f
---
libavresample/audio_convert.c | 53 ++++++++++++++++++++++-------------------
1 file changed, 28 insertions(+), 25 deletions(-)
diff --git a/libavresample/audio_convert.c b/libavresample/audio_convert.c
index b57d2fa..371617c 100644
--- a/libavresample/audio_convert.c
+++ b/libavresample/audio_convert.c
@@ -378,32 +378,35 @@ int ff_audio_convert(AudioConvert *ac, AudioData *out, AudioData *in)
}
}
} else {
- switch (ac->func_type) {
- case CONV_FUNC_TYPE_FLAT: {
- if (!in->is_planar)
- len *= in->channels;
- if (use_generic) {
- for (p = 0; p < ac->planes; p++)
- ac->conv_flat_generic(out->data[p], in->data[p], len);
- } else {
- for (p = 0; p < ac->planes; p++)
- ac->conv_flat(out->data[p], in->data[p], len);
+ switch (ac->func_type) {
+ case CONV_FUNC_TYPE_FLAT: {
+ if (!in->is_planar)
+ len *= in->channels;
+ if (use_generic) {
+ for (p = 0; p < ac->planes; p++)
+ ac->conv_flat_generic(out->data[p], in->data[p], len);
+ } else {
+ for (p = 0; p < ac->planes; p++)
+ ac->conv_flat(out->data[p], in->data[p], len);
+ }
+ break;
+ }
+ case CONV_FUNC_TYPE_INTERLEAVE:
+ if (use_generic)
+ ac->conv_interleave_generic(out->data[0], in->data, len,
+ ac->channels);
+ else
+ ac->conv_interleave(out->data[0], in->data, len, ac->channels);
+ break;
+ case CONV_FUNC_TYPE_DEINTERLEAVE:
+ if (use_generic)
+ ac->conv_deinterleave_generic(out->data, in->data[0], len,
+ ac->channels);
+ else
+ ac->conv_deinterleave(out->data, in->data[0], len,
+ ac->channels);
+ break;
}
- break;
- }
- case CONV_FUNC_TYPE_INTERLEAVE:
- if (use_generic)
- ac->conv_interleave_generic(out->data[0], in->data, len, ac->channels);
- else
- ac->conv_interleave(out->data[0], in->data, len, ac->channels);
- break;
- case CONV_FUNC_TYPE_DEINTERLEAVE:
- if (use_generic)
- ac->conv_deinterleave_generic(out->data, in->data[0], len, ac->channels);
- else
- ac->conv_deinterleave(out->data, in->data[0], len, ac->channels);
- break;
- }
}
out->nb_samples = in->nb_samples;
More information about the ffmpeg-cvslog
mailing list