[FFmpeg-cvslog] r18289 - trunk/libavcodec/interplayvideo.c
reimar
subversion
Wed Apr 1 00:28:36 CEST 2009
Author: reimar
Date: Wed Apr 1 00:28:36 2009
New Revision: 18289
Log:
Fix ipvideo_decode_block_opcode_0xD again.
Modified:
trunk/libavcodec/interplayvideo.c
Modified: trunk/libavcodec/interplayvideo.c
==============================================================================
--- trunk/libavcodec/interplayvideo.c Tue Mar 31 23:11:04 2009 (r18288)
+++ trunk/libavcodec/interplayvideo.c Wed Apr 1 00:28:36 2009 (r18289)
@@ -493,18 +493,19 @@ static int ipvideo_decode_block_opcode_0
static int ipvideo_decode_block_opcode_0xD(IpvideoContext *s)
{
int y;
- unsigned char P;
+ unsigned char P[2];
/* 4-color block encoding: each 4x4 block is a different color */
CHECK_STREAM_PTR(4);
- for (y = 0; y < 16; y++) {
- if (!(y & 3)) // start of block
- P = *s->stream_ptr++;
- memset(s->pixel_ptr, P, 4);
+ for (y = 0; y < 8; y++) {
+ if (!(y & 3)) {
+ P[0] = *s->stream_ptr++;
+ P[1] = *s->stream_ptr++;
+ }
+ memset(s->pixel_ptr, P[0], 4);
+ memset(s->pixel_ptr + 4, P[1], 4);
s->pixel_ptr += s->stride;
- // switch to right half
- if (y == 7) s->pixel_ptr -= 8 * s->stride - 4;
}
/* report success */
More information about the ffmpeg-cvslog
mailing list