diff options
author | Vitor Sessak <vitor1001@gmail.com> | 2008-05-25 19:48:03 +0000 |
---|---|---|
committer | Vitor Sessak <vitor1001@gmail.com> | 2008-05-25 19:48:03 +0000 |
commit | 5012cf88a304a48629821cf29e3a795a647d17fc (patch) | |
tree | 56fc4fe72a1bae81c37b7b15c9b60686456e590a | |
parent | 9d3c35fcfc593bfca2e6811affd8f6e68044465f (diff) | |
download | ffmpeg-5012cf88a304a48629821cf29e3a795a647d17fc.tar.gz |
Merge two if's
Originally committed as revision 13401 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavcodec/ra144.c | 8 |
1 files changed, 3 insertions, 5 deletions
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); |