diff options
| author | Vitor Sessak <vitor1001@gmail.com> | 2007-07-18 14:45:01 +0000 |
|---|---|---|
| committer | Vitor Sessak <vitor1001@gmail.com> | 2007-07-18 14:45:01 +0000 |
| commit | c9128d569a2d7d58d8d3731cd63d76c2521f1777 (patch) | |
| tree | e4004dab5345cb76f213f30401c26842ae0f699e /libavcodec/alac.c | |
| parent | b37bce6b6138833bcd8de7b33c457e636aba4224 (diff) | |
| download | ffmpeg-c9128d569a2d7d58d8d3731cd63d76c2521f1777.tar.gz | |
Make deinterlace_16 receive an array as a parameter and not two separated vars
Originally committed as revision 9739 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/alac.c')
| -rw-r--r-- | libavcodec/alac.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavcodec/alac.c b/libavcodec/alac.c index 0e4f100f92..942f6865d4 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -399,7 +399,7 @@ static void predictor_decompress_fir_adapt(int32_t *error_buffer, } } -static void deinterlace_16(int32_t *buffer_a, int32_t *buffer_b, +static void deinterlace_16(int32_t *buffer[MAX_CHANNELS], int16_t *buffer_out, int numchannels, int numsamples, uint8_t interlacing_shift, @@ -416,8 +416,8 @@ static void deinterlace_16(int32_t *buffer_a, int32_t *buffer_b, int16_t left; int16_t right; - midright = buffer_a[i]; - difference = buffer_b[i]; + midright = buffer[0][i]; + difference = buffer[1][i]; right = midright - ((difference * interlacing_leftweight) >> interlacing_shift); @@ -434,8 +434,8 @@ static void deinterlace_16(int32_t *buffer_a, int32_t *buffer_b, for (i = 0; i < numsamples; i++) { int16_t left, right; - left = buffer_a[i]; - right = buffer_b[i]; + left = buffer[0][i]; + right = buffer[1][i]; buffer_out[i*numchannels] = left; buffer_out[i*numchannels + 1] = right; @@ -602,8 +602,7 @@ static int alac_decode_frame(AVCodecContext *avctx, switch(alac->setinfo_sample_size) { case 16: { if (channels == 2) { - deinterlace_16(alac->outputsamples_buffer[0], - alac->outputsamples_buffer[1], + deinterlace_16(alac->outputsamples_buffer, (int16_t*)outbuffer, alac->numchannels, outputsamples, |