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/vp6.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/vp6.c')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp6.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp6.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp6.c index ce0ec642a..4c2aec67a 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp6.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp6.c @@ -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,8 +576,8 @@ static av_cold int vp6_decode_init(AVCodecContext *avctx) { VP56Context *s = avctx->priv_data; - vp56_init(avctx, avctx->codec->id == CODEC_ID_VP6, - avctx->codec->id == CODEC_ID_VP6A); + 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; s->filter = vp6_filter; @@ -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, /*.capabilities = */CODEC_CAP_DR1, /*.next = */NULL, /*.flush = */NULL, @@ -632,7 +632,7 @@ AVCodec vp6f_decoder = { vp6_decode_init, NULL, vp6_decode_free, - vp56_decode_frame, + ff_vp56_decode_frame, /*.capabilities = */CODEC_CAP_DR1, /*.next = */NULL, /*.flush = */NULL, @@ -650,7 +650,7 @@ AVCodec vp6a_decoder = { vp6_decode_init, NULL, vp6_decode_free, - vp56_decode_frame, + ff_vp56_decode_frame, /*.capabilities = */CODEC_CAP_DR1, /*.next = */NULL, /*.flush = */NULL, |