← Back to branch summary

~ubuntu-branches/ubuntu/raring/libav/raring-security

« back to all changes in this revision

Viewing changes to libavcodec/vc1dec.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2011-09-28 09:18:34 UTC
  • mfrom: (1.3.7 sid)
  • Revision ID: package-import@ubuntu.com-20110928091834-w415mnuh06h4zpvc
Tags: 4:0.7.1-7ubuntu2
Revert "Convert package to include multiarch support."

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/vc1dec.c
243
243
    }
244
244
    v->vc1dsp.vc1_v_loop_filter16(s->dest[0] + 8*s->linesize, s->linesize, pq);
245
245
 
246
 
    if (s->mb_y == s->mb_height-1) {
 
246
    if (s->mb_y == s->end_mb_y-1) {
247
247
        if (s->mb_x) {
248
248
            v->vc1dsp.vc1_h_loop_filter16(s->dest[0], s->linesize, pq);
249
249
            v->vc1dsp.vc1_h_loop_filter8(s->dest[1], s->uvlinesize, pq);
295
295
            v->vc1dsp.vc1_v_loop_filter16(s->dest[0] - 8 * s->linesize, s->linesize, pq);
296
296
        }
297
297
 
298
 
        if (s->mb_y == s->mb_height) {
 
298
        if (s->mb_y == s->end_mb_y) {
299
299
            if (s->mb_x) {
300
300
                if (s->mb_x >= 2)
301
301
                    v->vc1dsp.vc1_h_loop_filter16(s->dest[0] - 16 * s->linesize - 16, s->linesize, pq);
2330
2330
    } else {
2331
2331
        dst      = s->dest[0] + (block_num & 1) * 8 + ((block_num & 2) * 4 - 8) * linesize;
2332
2332
    }
2333
 
    if (s->mb_y != s->mb_height || block_num < 2) {
 
2333
    if (s->mb_y != s->end_mb_y || block_num < 2) {
2334
2334
        int16_t (*mv)[2];
2335
2335
        int mv_stride;
2336
2336
 
3020
3020
        s->mb_x = 0;
3021
3021
        ff_init_block_index(s);
3022
3022
        memset(&s->coded_block[s->block_index[0]-s->b8_stride], 0,
3023
 
               s->b8_stride * sizeof(*s->coded_block));
 
3023
               (1 + s->b8_stride) * sizeof(*s->coded_block));
3024
3024
    }
3025
3025
    for(; s->mb_y < s->end_mb_y; s->mb_y++) {
3026
3026
        s->mb_x = 0;
3096
3096
        if(v->s.loop_filter) vc1_loop_filter_iblk_delayed(v, v->pq);
3097
3097
    }
3098
3098
    if (v->s.loop_filter)
3099
 
        ff_draw_horiz_band(s, (s->mb_height-1)*16, 16);
 
3099
        ff_draw_horiz_band(s, (s->end_mb_y-1)*16, 16);
3100
3100
    ff_er_add_slice(s, 0, s->start_mb_y, s->mb_width - 1, s->end_mb_y - 1, (AC_END|DC_END|MV_END));
3101
3101
}
3102
3102
 
3219
3219
        s->first_slice_line = 0;
3220
3220
    }
3221
3221
    if (v->s.loop_filter)
3222
 
        ff_draw_horiz_band(s, (s->mb_height-1)*16, 16);
 
3222
        ff_draw_horiz_band(s, (s->end_mb_y-1)*16, 16);
3223
3223
    ff_er_add_slice(s, 0, s->start_mb_y, s->mb_width - 1, s->end_mb_y - 1, (AC_END|DC_END|MV_END));
3224
3224
}
3225
3225
 
3227
3227
{
3228
3228
    MpegEncContext *s = &v->s;
3229
3229
 
3230
 
    ff_er_add_slice(s, 0, 0, s->mb_width - 1, s->mb_height - 1, (AC_END|DC_END|MV_END));
 
3230
    ff_er_add_slice(s, 0, s->start_mb_y, s->mb_width - 1, s->end_mb_y - 1, (AC_END|DC_END|MV_END));
3231
3231
    s->first_slice_line = 1;
3232
 
    for(s->mb_y = 0; s->mb_y < s->mb_height; s->mb_y++) {
 
3232
    for(s->mb_y = s->start_mb_y; s->mb_y < s->end_mb_y; s->mb_y++) {
3233
3233
        s->mb_x = 0;
3234
3234
        ff_init_block_index(s);
3235
3235
        ff_update_block_index(s);