Revision d9504970

View differences:

libavcodec/vp5.c
42 42
    vp56_init_range_decoder(&s->c, buf, buf_size);
43 43
    s->framep[VP56_FRAME_CURRENT]->key_frame = !vp56_rac_get(c);
44 44
    vp56_rac_get(c);
45
    vp56_init_dequant(s, vp56_rac_gets(c, 6));
45
    ff_vp56_init_dequant(s, vp56_rac_gets(c, 6));
46 46
    if (s->framep[VP56_FRAME_CURRENT]->key_frame)
47 47
    {
48 48
        vp56_rac_gets(c, 8);
......
254 254
{
255 255
    VP56Context *s = avctx->priv_data;
256 256

  
257
    vp56_init(avctx, 1, 0);
257
    ff_vp56_init(avctx, 1, 0);
258 258
    s->vp56_coord_div = vp5_coord_div;
259 259
    s->parse_vector_adjustment = vp5_parse_vector_adjustment;
260 260
    s->parse_coeff = vp5_parse_coeff;
......
273 273
    sizeof(VP56Context),
274 274
    vp5_decode_init,
275 275
    NULL,
276
    vp56_free,
277
    vp56_decode_frame,
276
    ff_vp56_free,
277
    ff_vp56_decode_frame,
278 278
    CODEC_CAP_DR1,
279 279
    .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"),
280 280
};
libavcodec/vp56.c
28 28
#include "vp56data.h"
29 29

  
30 30

  
31
void vp56_init_dequant(VP56Context *s, int quantizer)
31
void ff_vp56_init_dequant(VP56Context *s, int quantizer)
32 32
{
33 33
    s->quantizer = quantizer;
34 34
    s->dequant_dc = vp56_dc_dequant[quantizer] << 2;
......
481 481
    return 0;
482 482
}
483 483

  
484
int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
484
int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
485 485
                      AVPacket *avpkt)
486 486
{
487 487
    const uint8_t *buf = avpkt->data;
......
639 639
    return avpkt->size;
640 640
}
641 641

  
642
av_cold void vp56_init(AVCodecContext *avctx, int flip, int has_alpha)
642
av_cold void ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha)
643 643
{
644 644
    VP56Context *s = avctx->priv_data;
645 645
    int i;
......
678 678
    }
679 679
}
680 680

  
681
av_cold int vp56_free(AVCodecContext *avctx)
681
av_cold int ff_vp56_free(AVCodecContext *avctx)
682 682
{
683 683
    VP56Context *s = avctx->priv_data;
684 684

  
libavcodec/vp56.h
170 170
};
171 171

  
172 172

  
173
void vp56_init(AVCodecContext *avctx, int flip, int has_alpha);
174
int vp56_free(AVCodecContext *avctx);
175
void vp56_init_dequant(VP56Context *s, int quantizer);
176
int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
173
void ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha);
174
int ff_vp56_free(AVCodecContext *avctx);
175
void ff_vp56_init_dequant(VP56Context *s, int quantizer);
176
int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
177 177
                      AVPacket *avpkt);
178 178

  
179 179

  
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