Mercurial > libavcodec.hg
changeset 12292:d8364962cc4a libavcodec
ff_prefix non static vp56 functions.
| author | alexc |
|---|---|
| date | Wed, 28 Jul 2010 05:36:33 +0000 |
| parents | d6ee9556010d |
| children | 83400282990a |
| files | vp5.c vp56.c vp56.h vp6.c |
| diffstat | 4 files changed, 18 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/vp5.c Wed Jul 28 05:19:42 2010 +0000 +++ b/vp5.c Wed Jul 28 05:36:33 2010 +0000 @@ -42,7 +42,7 @@ vp56_init_range_decoder(&s->c, buf, buf_size); s->framep[VP56_FRAME_CURRENT]->key_frame = !vp56_rac_get(c); vp56_rac_get(c); - vp56_init_dequant(s, vp56_rac_gets(c, 6)); + ff_vp56_init_dequant(s, vp56_rac_gets(c, 6)); if (s->framep[VP56_FRAME_CURRENT]->key_frame) { vp56_rac_gets(c, 8); @@ -254,7 +254,7 @@ { VP56Context *s = avctx->priv_data; - vp56_init(avctx, 1, 0); + ff_vp56_init(avctx, 1, 0); s->vp56_coord_div = vp5_coord_div; s->parse_vector_adjustment = vp5_parse_vector_adjustment; s->parse_coeff = vp5_parse_coeff; @@ -273,8 +273,8 @@ sizeof(VP56Context), vp5_decode_init, NULL, - vp56_free, - vp56_decode_frame, + ff_vp56_free, + ff_vp56_decode_frame, CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("On2 VP5"), };
--- a/vp56.c Wed Jul 28 05:19:42 2010 +0000 +++ b/vp56.c Wed Jul 28 05:36:33 2010 +0000 @@ -28,7 +28,7 @@ #include "vp56data.h" -void vp56_init_dequant(VP56Context *s, int quantizer) +void ff_vp56_init_dequant(VP56Context *s, int quantizer) { s->quantizer = quantizer; s->dequant_dc = vp56_dc_dequant[quantizer] << 2; @@ -481,7 +481,7 @@ return 0; } -int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size, +int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; @@ -639,7 +639,7 @@ return avpkt->size; } -av_cold void vp56_init(AVCodecContext *avctx, int flip, int has_alpha) +av_cold void ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha) { VP56Context *s = avctx->priv_data; int i; @@ -678,7 +678,7 @@ } } -av_cold int vp56_free(AVCodecContext *avctx) +av_cold int ff_vp56_free(AVCodecContext *avctx) { VP56Context *s = avctx->priv_data;
--- a/vp56.h Wed Jul 28 05:19:42 2010 +0000 +++ b/vp56.h Wed Jul 28 05:36:33 2010 +0000 @@ -170,10 +170,10 @@ }; -void vp56_init(AVCodecContext *avctx, int flip, int has_alpha); -int vp56_free(AVCodecContext *avctx); -void vp56_init_dequant(VP56Context *s, int quantizer); -int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size, +void ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha); +int ff_vp56_free(AVCodecContext *avctx); +void ff_vp56_init_dequant(VP56Context *s, int quantizer); +int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt);
--- a/vp6.c Wed Jul 28 05:19:42 2010 +0000 +++ b/vp6.c Wed Jul 28 05:36:33 2010 +0000 @@ -54,7 +54,7 @@ int separated_coeff = buf[0] & 1; s->framep[VP56_FRAME_CURRENT]->key_frame = !(buf[0] & 0x80); - vp56_init_dequant(s, (buf[0] >> 1) & 0x3F); + ff_vp56_init_dequant(s, (buf[0] >> 1) & 0x3F); if (s->framep[VP56_FRAME_CURRENT]->key_frame) { sub_version = buf[1] >> 3; @@ -576,7 +576,7 @@ { VP56Context *s = avctx->priv_data; - vp56_init(avctx, avctx->codec->id == CODEC_ID_VP6, + ff_vp56_init(avctx, avctx->codec->id == CODEC_ID_VP6, avctx->codec->id == CODEC_ID_VP6A); s->vp56_coord_div = vp6_coord_div; s->parse_vector_adjustment = vp6_parse_vector_adjustment; @@ -594,7 +594,7 @@ VP56Context *s = avctx->priv_data; int pt, ct, cg; - vp56_free(avctx); + ff_vp56_free(avctx); for (pt=0; pt<2; pt++) { free_vlc(&s->dccv_vlc[pt]); @@ -614,7 +614,7 @@ vp6_decode_init, NULL, vp6_decode_free, - vp56_decode_frame, + ff_vp56_decode_frame, CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("On2 VP6"), }; @@ -628,7 +628,7 @@ vp6_decode_init, NULL, vp6_decode_free, - vp56_decode_frame, + ff_vp56_decode_frame, CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version)"), }; @@ -642,7 +642,7 @@ vp6_decode_init, NULL, vp6_decode_free, - vp56_decode_frame, + ff_vp56_decode_frame, CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channel)"), };