From 5012cf88a304a48629821cf29e3a795a647d17fc Mon Sep 17 00:00:00 2001 From: Vitor Sessak Date: Sun, 25 May 2008 19:48:03 +0000 Subject: Merge two if's Originally committed as revision 13401 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/ra144.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c index ca609996d5..264c101e14 100644 --- a/libavcodec/ra144.c +++ b/libavcodec/ra144.c @@ -214,16 +214,14 @@ static void do_output_subblock(Real144_internal *glob, if (a) { a += HALFBLOCK - 1; rotate_block(glob->buffer_2, buffer_a, a); + m[0] = irms(buffer_a, gval) >> 12; + } else { + m[0] = 0; } m[1] = ((ftable1[b] >> 4) * gval) >> 8; m[2] = ((ftable2[c] >> 4) * gval) >> 8; - if (a) - m[0] = irms(buffer_a, gval) >> 12; - else - m[0] = 0; - memmove(glob->buffer_2, glob->buffer_2 + BLOCKSIZE, (BUFFERSIZE - BLOCKSIZE) * 2); -- cgit v1.2.3