← Back to branch summary

~ubuntu-branches/ubuntu/lucid/ffmpeg/lucid-security

« back to all changes in this revision

Viewing changes to libavcodec/cavs.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-03-13 09:18:28 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090313091828-n4ktby5eca487uhv
Tags: 3:0.svn20090303-1ubuntu1+unstripped1
merge from ubuntu.jaunty branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/cavs.c
567
567
        h->mv[MV_FWD_D3] = ff_cavs_un_mv;
568
568
        h->mv[MV_BWD_D3] = ff_cavs_un_mv;
569
569
    }
570
 
    /* set pointer for co-located macroblock type */
571
 
    h->col_type = &h->col_type_base[h->mby*h->mb_width + h->mbx];
572
570
}
573
571
 
574
572
/**
592
590
    h->top_mv[1][h->mbx*2+0] = h->mv[MV_BWD_X2];
593
591
    h->top_mv[1][h->mbx*2+1] = h->mv[MV_BWD_X3];
594
592
    /* next MB address */
 
593
    h->mbidx++;
595
594
    h->mbx++;
596
595
    if(h->mbx == h->mb_width) { //new mb line
597
596
        h->flags = B_AVAIL|C_AVAIL;
608
607
        h->cv = h->picture.data[2] + h->mby*8*h->c_stride;
609
608
        if(h->mby == h->mb_height) { //frame end
610
609
            return 0;
611
 
        } else {
612
 
            //check_for_slice(h);
613
610
        }
614
611
    }
615
612
    return 1;
639
636
    h->c_stride = h->picture.linesize[1];
640
637
    h->luma_scan[2] = 8*h->l_stride;
641
638
    h->luma_scan[3] = 8*h->l_stride+8;
642
 
    h->mbx = h->mby = 0;
 
639
    h->mbx = h->mby = h->mbidx = 0;
643
640
    h->flags = 0;
644
641
}
645
642