RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-01 22:49:21 +00:00
Code Issues Projects Releases Wiki Activity

Deduplicate code by moving it outside the if/else

Browse Source 
Originally committed as revision 18269 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2009-03-31 14:06:22 +00:00
parent 268a618ba6
commit 1548839e51
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/interplayvideo.c
View File

@ -421,13 +421,13 @@ static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s)
} }
} else { } else {
if (P[2] <= P[3]) {
uint64_t flags; uint64_t flags;
/* 1 of 4 colors for each 2x1 block, need 8 more bytes */ /* 1 of 4 colors for each 2x1 or 1x2 block, need 8 more bytes */
CHECK_STREAM_PTR(8); CHECK_STREAM_PTR(8);
flags = bytestream_get_le64(&s->stream_ptr); flags = bytestream_get_le64(&s->stream_ptr);
if (P[2] <= P[3]) {
for (y = 0; y < 8; y++) { for (y = 0; y < 8; y++) {
for (x = 0; x < 8; x += 2, flags >>= 2) { for (x = 0; x < 8; x += 2, flags >>= 2) {
s->pixel_ptr[x ] = s->pixel_ptr[x ] =
@ -436,12 +436,6 @@ static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s)
s->pixel_ptr += s->stride; s->pixel_ptr += s->stride;
} }
} else { } else {
uint64_t flags;
/* 1 of 4 colors for each 1x2 block, need 8 more bytes */
CHECK_STREAM_PTR(8);
flags = bytestream_get_le64(&s->stream_ptr);
for (y = 0; y < 8; y += 2) { for (y = 0; y < 8; y += 2) {
for (x = 0; x < 8; x++, flags >>= 2) { for (x = 0; x < 8; x++, flags >>= 2) {
s->pixel_ptr[x ] = s->pixel_ptr[x ] =