X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=libavcodec%2Fwmv2dec.c;h=e1f86d854b63734b0c17b9ac57f9abce37491885;hb=c2fa6bb0e8703a7a6aa10e11f9ab36094416d83f;hp=ca8afe6f09e18341ade4bbefa7ac2bf5fa31affd;hpb=0c6a70873fc6e43194b471d112c30823b6c8d0b4;p=ffmpeg diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index ca8afe6f09e..e1f86d854b6 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -228,7 +228,10 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext *s) s->picture_number++; // FIXME ? if (w->j_type) { - ff_intrax8_decode_picture(&w->x8, 2 * s->qscale, (s->qscale - 1) | 1); + ff_intrax8_decode_picture(&w->x8, &s->current_picture, + &s->gb, &s->mb_x, &s->mb_y, + 2 * s->qscale, (s->qscale - 1) | 1, + s->loop_filter, s->low_delay); ff_er_add_slice(&w->s.er, 0, 0, (w->s.mb_x >> 1) - 1, (w->s.mb_y >> 1) - 1, @@ -471,9 +474,9 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx) ff_wmv2_common_init(w); - ff_intrax8_common_init(&w->x8, &w->s); - - return 0; + return ff_intrax8_common_init(avctx, &w->x8, &w->s.idsp, + w->s.block, w->s.block_last_index, + w->s.mb_width, w->s.mb_height); } static av_cold int wmv2_decode_end(AVCodecContext *avctx)