diff options
author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-03-31 14:10:45 +0000 |
---|---|---|
committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-03-31 14:10:45 +0000 |
commit | 9aaacc246affe5106131aef236d3977cd780ad80 (patch) | |
tree | b57a2e034b597091e91b777fefe45bd95619f15d /libavcodec/interplayvideo.c | |
parent | 1548839e513b4f782b1b5ebac3cdecb0abd1d84c (diff) | |
download | ffmpeg-9aaacc246affe5106131aef236d3977cd780ad80.tar.gz |
Reindent
Originally committed as revision 18270 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/interplayvideo.c')
-rw-r--r-- | libavcodec/interplayvideo.c | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index 821181b5a6..ecf6c19fc7 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -389,35 +389,35 @@ static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s) if (P[0] <= P[1]) { if (P[2] <= P[3]) { - /* 1 of 4 colors for each pixel, need 16 more bytes */ - CHECK_STREAM_PTR(16); + /* 1 of 4 colors for each pixel, need 16 more bytes */ + CHECK_STREAM_PTR(16); - for (y = 0; y < 8; y++) { - /* get the next set of 8 2-bit flags */ - int flags = bytestream_get_le16(&s->stream_ptr); - for (x = 0; x < 8; x++, flags >>= 2) { - *s->pixel_ptr++ = P[flags & 0x03]; + for (y = 0; y < 8; y++) { + /* get the next set of 8 2-bit flags */ + int flags = bytestream_get_le16(&s->stream_ptr); + for (x = 0; x < 8; x++, flags >>= 2) { + *s->pixel_ptr++ = P[flags & 0x03]; + } + s->pixel_ptr += s->line_inc; } - s->pixel_ptr += s->line_inc; - } } else { - uint32_t flags; + uint32_t flags; - /* 1 of 4 colors for each 2x2 block, need 4 more bytes */ - CHECK_STREAM_PTR(4); + /* 1 of 4 colors for each 2x2 block, need 4 more bytes */ + CHECK_STREAM_PTR(4); - flags = bytestream_get_le32(&s->stream_ptr); + flags = bytestream_get_le32(&s->stream_ptr); - for (y = 0; y < 8; y += 2) { - for (x = 0; x < 8; x += 2, flags >>= 2) { - s->pixel_ptr[x ] = - s->pixel_ptr[x + 1 ] = - s->pixel_ptr[x + s->stride] = - s->pixel_ptr[x + 1 + s->stride] = P[flags & 0x03]; + for (y = 0; y < 8; y += 2) { + for (x = 0; x < 8; x += 2, flags >>= 2) { + s->pixel_ptr[x ] = + s->pixel_ptr[x + 1 ] = + s->pixel_ptr[x + s->stride] = + s->pixel_ptr[x + 1 + s->stride] = P[flags & 0x03]; + } + s->pixel_ptr += s->stride * 2; } - s->pixel_ptr += s->stride * 2; - } } } else { @@ -428,21 +428,21 @@ static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s) flags = bytestream_get_le64(&s->stream_ptr); if (P[2] <= P[3]) { - for (y = 0; y < 8; y++) { - for (x = 0; x < 8; x += 2, flags >>= 2) { - s->pixel_ptr[x ] = - s->pixel_ptr[x + 1] = P[flags & 0x03]; + for (y = 0; y < 8; y++) { + for (x = 0; x < 8; x += 2, flags >>= 2) { + s->pixel_ptr[x ] = + s->pixel_ptr[x + 1] = P[flags & 0x03]; + } + s->pixel_ptr += s->stride; } - s->pixel_ptr += s->stride; - } } else { - for (y = 0; y < 8; y += 2) { - for (x = 0; x < 8; x++, flags >>= 2) { - s->pixel_ptr[x ] = - s->pixel_ptr[x + s->stride] = P[flags & 0x03]; + for (y = 0; y < 8; y += 2) { + for (x = 0; x < 8; x++, flags >>= 2) { + s->pixel_ptr[x ] = + s->pixel_ptr[x + s->stride] = P[flags & 0x03]; + } + s->pixel_ptr += s->stride * 2; } - s->pixel_ptr += s->stride * 2; - } } } |