RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-29 10:52:20 +00:00
Code Issues Projects Releases Wiki Activity

ff_prefix non static vp56 functions.

Browse Source 
Originally committed as revision 24561 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Converse 2010-07-28 05:36:33 +00:00
parent 317167e7d9
commit d950497083
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/vp5.c
View File

@ -42,7 +42,7 @@ static int vp5_parse_header(VP56Context *s, const uint8_t *buf, int buf_size,
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 @@ static av_cold int vp5_decode_init(AVCodecContext *avctx)
{
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 @@ AVCodec vp5_decoder = {
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"),
};

8
libavcodec/vp56.c
View File

@ -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 @@ static int vp56_size_changed(AVCodecContext *avctx)
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 @@ int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
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 void vp56_init(AVCodecContext *avctx, int flip, int has_alpha)
}
}
av_cold int vp56_free(AVCodecContext *avctx)
av_cold int ff_vp56_free(AVCodecContext *avctx)
{
VP56Context *s = avctx->priv_data;

8
libavcodec/vp56.h
View File

@ -170,10 +170,10 @@ struct vp56_context {
};
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);

12
libavcodec/vp6.c
View File

@ -54,7 +54,7 @@ static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size,
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 @@ static av_cold int vp6_decode_init(AVCodecContext *avctx)
{
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 @@ static av_cold int vp6_decode_free(AVCodecContext *avctx)
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 @@ AVCodec vp6_decoder = {
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 @@ AVCodec vp6f_decoder = {
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 @@ AVCodec vp6a_decoder = {
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)"),
};