[FFmpeg-devel] [PATCH 2/2] cosmetics: indentation and spacing
Diego Biurrun
diego
Wed Jan 26 19:57:01 CET 2011
On Wed, Jan 26, 2011 at 01:46:34PM -0500, Justin Ruggles wrote:
>
OK
While you're changing those lines anyway you could
> --- a/libavcodec/dca.c
> +++ b/libavcodec/dca.c
> @@ -1838,14 +1838,13 @@ static av_cold int dca_decode_init(AVCodecContext * avctx)
>
> - s->scale_bias = 1.0;
> -
> - /* allow downmixing to stereo */
> - if (avctx->channels > 0 && avctx->request_channels < avctx->channels &&
> - avctx->request_channels == 2) {
> - avctx->channels = avctx->request_channels;
> - }
> + s->scale_bias = 1.0;
>
> + /* allow downmixing to stereo */
> + if (avctx->channels > 0 && avctx->request_channels < avctx->channels &&
> + avctx->request_channels == 2) {
> + avctx->channels = avctx->request_channels;
> + }
if (avctx->channels > 0 && avctx->request_channels < avctx->channels &&
avctx->request_channels == 2) {
> --- a/libavcodec/wmadec.c
> +++ b/libavcodec/wmadec.c
> @@ -791,13 +791,13 @@ static int wma_decode_frame(WMACodecContext *s, int16_t *samples)
> incr = s->nb_channels;
> - for (ch = 0; ch < MAX_CHANNELS; ch++)
> - output[ch] = s->frame_out[ch];
> - s->dsp.float_to_int16_interleave(samples, output, n, incr);
> - for(ch = 0; ch < incr; ch++) {
> - /* prepare for next block */
> - memmove(&s->frame_out[ch][0], &s->frame_out[ch][n], n * sizeof(float));
> - }
> + for (ch = 0; ch < MAX_CHANNELS; ch++)
> + output[ch] = s->frame_out[ch];
> + s->dsp.float_to_int16_interleave(samples, output, n, incr);
> + for(ch = 0; ch < incr; ch++) {
for (
Diego
More information about the ffmpeg-devel
mailing list