mss2.c (libav-12) | : | mss2.c (libav-12.1) | ||
---|---|---|---|---|
skipping to change at line 419 | skipping to change at line 419 | |||
v->end_mb_x = (w + 15) >> 4; | v->end_mb_x = (w + 15) >> 4; | |||
s->end_mb_y = (h + 15) >> 4; | s->end_mb_y = (h + 15) >> 4; | |||
if (v->respic & 1) | if (v->respic & 1) | |||
v->end_mb_x = v->end_mb_x + 1 >> 1; | v->end_mb_x = v->end_mb_x + 1 >> 1; | |||
if (v->respic & 2) | if (v->respic & 2) | |||
s->end_mb_y = s->end_mb_y + 1 >> 1; | s->end_mb_y = s->end_mb_y + 1 >> 1; | |||
ff_vc1_decode_blocks(v); | ff_vc1_decode_blocks(v); | |||
ff_er_frame_end(&s->er); | if (v->end_mb_x == s->mb_width && s->end_mb_y == s->mb_height) { | |||
ff_er_frame_end(&s->er); | ||||
} else { | ||||
av_log(v->s.avctx, AV_LOG_WARNING, | ||||
"disabling error correction due to block count mismatch %dx%d != | ||||
%dx%d\n", | ||||
v->end_mb_x, s->end_mb_y, s->mb_width, s->mb_height); | ||||
} | ||||
ff_mpv_frame_end(s); | ff_mpv_frame_end(s); | |||
f = s->current_picture.f; | f = s->current_picture.f; | |||
if (v->respic == 3) { | if (v->respic == 3) { | |||
ctx->dsp.upsample_plane(f->data[0], f->linesize[0], w, h); | ctx->dsp.upsample_plane(f->data[0], f->linesize[0], w, h); | |||
ctx->dsp.upsample_plane(f->data[1], f->linesize[1], w >> 1, h >> 1); | ctx->dsp.upsample_plane(f->data[1], f->linesize[1], w >> 1, h >> 1); | |||
ctx->dsp.upsample_plane(f->data[2], f->linesize[2], w >> 1, h >> 1); | ctx->dsp.upsample_plane(f->data[2], f->linesize[2], w >> 1, h >> 1); | |||
} else if (v->respic) | } else if (v->respic) | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 8 lines changed or added |