[SCM] libav/experimental: Another minor simplification
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:04:04 UTC 2013
The following commit has been merged in the experimental branch:
commit 9c8d9f251ea9ea5f85f546a82b62bd6e540335a0
Author: Vitor Sessak <vitor1001 at gmail.com>
Date: Wed Jul 18 20:23:43 2007 +0000
Another minor simplification
Originally committed as revision 9744 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 942f686..03f9ae3 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -412,19 +412,16 @@ static void deinterlace_16(int32_t *buffer[MAX_CHANNELS],
/* weighted interlacing */
if (interlacing_leftweight) {
for (i = 0; i < numsamples; i++) {
- int32_t difference, midright;
- int16_t left;
- int16_t right;
+ int32_t a, b;
- midright = buffer[0][i];
- difference = buffer[1][i];
+ a = buffer[0][i];
+ b = buffer[1][i];
+ a -= (b * interlacing_leftweight) >> interlacing_shift;
+ b += a;
- right = midright - ((difference * interlacing_leftweight) >> interlacing_shift);
- left = right + difference;
-
- buffer_out[i*numchannels] = left;
- buffer_out[i*numchannels + 1] = right;
+ buffer_out[i*numchannels] = b;
+ buffer_out[i*numchannels + 1] = a;
}
return;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list