- for (y = 0; y < s->mb_height; y++) {
- for (x = 0; x < s->mb_width; x += 2) {
- bitplane[n] = vc1_pack_bitplanes(ff_bp, x+1, y, s->mb_stride);
- bitplane[n] |= (vc1_pack_bitplanes(ff_bp, x, y, s->mb_stride) << 4);
- ++n;
- }
- }
+ for (y = 0; y < s->mb_height; y++)
+ for (x = 0; x < s->mb_width; x++, n++)
+ vc1_pack_bitplanes(bitplane, n, ff_bp, x, y, s->mb_stride);
+ if (n & 1) /* move last nibble to the high order */
+ bitplane[n/2] <<= 4;