Revision 9156a5ad libavcodec/interplayvideo.c

View differences:

libavcodec/interplayvideo.c
586 586
        + s->avctx->width - 8;
587 587

  
588 588
    init_get_bits(&gb, s->decoding_map, s->decoding_map_size * 8);
589
    for (y = 0; y < (s->stride * s->avctx->height); y += s->stride * 8) {
590
        for (x = y; x < y + s->avctx->width; x += 8) {
589
    for (y = 0; y < s->avctx->height; y += 8) {
590
        for (x = 0; x < s->avctx->width; x += 8) {
591 591
            opcode = get_bits(&gb, 4);
592 592

  
593 593
            debug_interplay("  block @ (%3d, %3d): encoding 0x%X, data ptr @ %p\n",
594
                            x - y, y / s->stride, opcode, s->stream_ptr);
594
                            x, y, opcode, s->stream_ptr);
595 595

  
596
            s->pixel_ptr = s->current_frame.data[0] + x;
596
            s->pixel_ptr = s->current_frame.data[0] + x
597
                          + y*s->current_frame.linesize[0];
597 598
            ret = ipvideo_decode_block[opcode](s);
598 599
            if (ret != 0) {
599 600
                av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode problem on frame %d, @ block (%d, %d)\n",
600
                       frame, x - y, y / s->stride);
601
                       frame, x, y);
601 602
                return;
602 603
            }
603 604
        }

Also available in: Unified diff