Revision d9504970 libavcodec/vp6.c

View differences:

libavcodec/vp6.c
54 54
    int separated_coeff = buf[0] & 1;
55 55

  
56 56
    s->framep[VP56_FRAME_CURRENT]->key_frame = !(buf[0] & 0x80);
57
    vp56_init_dequant(s, (buf[0] >> 1) & 0x3F);
57
    ff_vp56_init_dequant(s, (buf[0] >> 1) & 0x3F);
58 58

  
59 59
    if (s->framep[VP56_FRAME_CURRENT]->key_frame) {
60 60
        sub_version = buf[1] >> 3;
......
576 576
{
577 577
    VP56Context *s = avctx->priv_data;
578 578

  
579
    vp56_init(avctx, avctx->codec->id == CODEC_ID_VP6,
579
    ff_vp56_init(avctx, avctx->codec->id == CODEC_ID_VP6,
580 580
                     avctx->codec->id == CODEC_ID_VP6A);
581 581
    s->vp56_coord_div = vp6_coord_div;
582 582
    s->parse_vector_adjustment = vp6_parse_vector_adjustment;
......
594 594
    VP56Context *s = avctx->priv_data;
595 595
    int pt, ct, cg;
596 596

  
597
    vp56_free(avctx);
597
    ff_vp56_free(avctx);
598 598

  
599 599
    for (pt=0; pt<2; pt++) {
600 600
        free_vlc(&s->dccv_vlc[pt]);
......
614 614
    vp6_decode_init,
615 615
    NULL,
616 616
    vp6_decode_free,
617
    vp56_decode_frame,
617
    ff_vp56_decode_frame,
618 618
    CODEC_CAP_DR1,
619 619
    .long_name = NULL_IF_CONFIG_SMALL("On2 VP6"),
620 620
};
......
628 628
    vp6_decode_init,
629 629
    NULL,
630 630
    vp6_decode_free,
631
    vp56_decode_frame,
631
    ff_vp56_decode_frame,
632 632
    CODEC_CAP_DR1,
633 633
    .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version)"),
634 634
};
......
642 642
    vp6_decode_init,
643 643
    NULL,
644 644
    vp6_decode_free,
645
    vp56_decode_frame,
645
    ff_vp56_decode_frame,
646 646
    CODEC_CAP_DR1,
647 647
    .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channel)"),
648 648
};

Also available in: Unified diff