diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-03-31 13:33:55 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-03-31 13:33:55 +0000 |
| commit | 3766b9e0a8e1e7cc75b9061034d2d42ff433f54a (patch) | |
| tree | 8a4a568b91fa6a64d4926d0bd031f982dda3fdd5 /libavcodec/interplayvideo.c | |
| parent | 0312b77ccdef432780f67dbf186150abdac287bf (diff) | |
| download | ffmpeg-3766b9e0a8e1e7cc75b9061034d2d42ff433f54a.tar.gz | |
Remove now pointless temporary pix variables.
Originally committed as revision 18265 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/interplayvideo.c')
| -rw-r--r-- | libavcodec/interplayvideo.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index 1dc5242a22..c41fddb539 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -380,7 +380,6 @@ static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s) int x, y; unsigned char P[4]; unsigned int flags = 0; - unsigned char pix; /* 4-color encoding */ CHECK_STREAM_PTR(4); @@ -411,11 +410,10 @@ static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s) for (y = 0; y < 8; y += 2) { for (x = 0; x < 8; x += 2, flags >>= 2) { - pix = P[flags & 0x03]; s->pixel_ptr[x ] = s->pixel_ptr[x + 1 ] = s->pixel_ptr[x + s->stride] = - s->pixel_ptr[x + 1 + s->stride] = pix; + s->pixel_ptr[x + 1 + s->stride] = P[flags & 0x03]; } s->pixel_ptr += s->stride * 2; } @@ -431,9 +429,8 @@ static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s) flags = bytestream_get_le32(&s->stream_ptr); } for (x = 0; x < 8; x += 2, flags >>= 2) { - pix = P[flags & 0x03]; s->pixel_ptr[x ] = - s->pixel_ptr[x + 1] = pix; + s->pixel_ptr[x + 1] = P[flags & 0x03]; } s->pixel_ptr += s->stride; } @@ -449,9 +446,8 @@ static int ipvideo_decode_block_opcode_0x9(IpvideoContext *s) flags = bytestream_get_le32(&s->stream_ptr); } for (x = 0; x < 8; x++, flags >>= 2) { - pix = P[flags & 0x03]; s->pixel_ptr[x ] = - s->pixel_ptr[x + s->stride] = pix; + s->pixel_ptr[x + s->stride] = P[flags & 0x03]; } s->pixel_ptr += s->stride * 2; } @@ -578,18 +574,16 @@ static int ipvideo_decode_block_opcode_0xB(IpvideoContext *s) static int ipvideo_decode_block_opcode_0xC(IpvideoContext *s) { int x, y; - unsigned char pix; /* 16-color block encoding: each 2x2 block is a different color */ CHECK_STREAM_PTR(16); for (y = 0; y < 8; y += 2) { for (x = 0; x < 8; x += 2) { - pix = *s->stream_ptr++; s->pixel_ptr[x ] = s->pixel_ptr[x + 1 ] = s->pixel_ptr[x + s->stride] = - s->pixel_ptr[x + 1 + s->stride] = pix; + s->pixel_ptr[x + 1 + s->stride] = *s->stream_ptr++; } s->pixel_ptr += s->stride * 2; } |