diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-08-02 12:54:35 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-08-02 12:54:35 +0400 |
| commit | c5d184664fec4340b57082cd1cc31220d9f1220b (patch) | |
| tree | 34c6103e95b6538a8e71d1ba87897536b7b51015 /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp5.c | |
| parent | aef6f86e8400fa5ee1e9d9ddc6190412ef09e519 (diff) | |
updated ffmpeg (thanks to Aleksoid for finding the conflict in avcore\utils.c for Debug VS2010 builds)
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2180 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp5.c')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp5.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp5.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp5.c index 3ebff017a..bb9b62e07 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp5.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp5.c @@ -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, /*.capabilities = */CODEC_CAP_DR1, /*.next = */NULL, /*.flush = */NULL, |