mirror of https://git.ffmpeg.org/ffmpeg.git
Merge two if's
Originally committed as revision 13401 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
9d3c35fcfc
commit
5012cf88a3
|
@ -214,16 +214,14 @@ static void do_output_subblock(Real144_internal *glob,
|
||||||
if (a) {
|
if (a) {
|
||||||
a += HALFBLOCK - 1;
|
a += HALFBLOCK - 1;
|
||||||
rotate_block(glob->buffer_2, buffer_a, a);
|
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[1] = ((ftable1[b] >> 4) * gval) >> 8;
|
||||||
m[2] = ((ftable2[c] >> 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,
|
memmove(glob->buffer_2, glob->buffer_2 + BLOCKSIZE,
|
||||||
(BUFFERSIZE - BLOCKSIZE) * 2);
|
(BUFFERSIZE - BLOCKSIZE) * 2);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue