Revision 351653a5 libavcodec/vc1dec.c

View differences:

libavcodec/vc1dec.c
2617 2617
    s->mb_intra = 1;
2618 2618
    s->first_slice_line = 1;
2619 2619
    for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) {
2620
        for(s->mb_x = 0; s->mb_x < s->mb_width; s->mb_x++) {
2621
            ff_init_block_index(s);
2620
        s->mb_x = 0;
2621
        ff_init_block_index(s);
2622
        for(; s->mb_x < s->mb_width; s->mb_x++) {
2622 2623
            ff_update_block_index(s);
2623 2624
            s->dsp.clear_blocks(s->block[0]);
2624 2625
            mb_pos = s->mb_x + s->mb_y * s->mb_width;
......
2730 2731
    s->mb_intra = 1;
2731 2732
    s->first_slice_line = 1;
2732 2733
    for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) {
2733
        for(s->mb_x = 0; s->mb_x < s->mb_width; s->mb_x++) {
2734
            ff_init_block_index(s);
2734
        s->mb_x = 0;
2735
        ff_init_block_index(s);
2736
        for(;s->mb_x < s->mb_width; s->mb_x++) {
2735 2737
            ff_update_block_index(s);
2736 2738
            s->dsp.clear_blocks(s->block[0]);
2737 2739
            mb_pos = s->mb_x + s->mb_y * s->mb_stride;
......
2849 2851
    s->first_slice_line = 1;
2850 2852
    memset(v->cbp_base, 0, sizeof(v->cbp_base[0])*2*s->mb_stride);
2851 2853
    for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) {
2852
        for(s->mb_x = 0; s->mb_x < s->mb_width; s->mb_x++) {
2853
            ff_init_block_index(s);
2854
        s->mb_x = 0;
2855
        ff_init_block_index(s);
2856
        for(; s->mb_x < s->mb_width; s->mb_x++) {
2854 2857
            ff_update_block_index(s);
2855 2858

  
2856 2859
            vc1_decode_p_mb(v);
......
2898 2901

  
2899 2902
    s->first_slice_line = 1;
2900 2903
    for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) {
2901
        for(s->mb_x = 0; s->mb_x < s->mb_width; s->mb_x++) {
2902
            ff_init_block_index(s);
2904
        s->mb_x = 0;
2905
        ff_init_block_index(s);
2906
        for(; s->mb_x < s->mb_width; s->mb_x++) {
2903 2907
            ff_update_block_index(s);
2904 2908

  
2905 2909
            vc1_decode_b_mb(v);

Also available in: Unified diff