aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vp6.c
diff options
context:
space:
mode:
authorJason Garrett-Glaser <darkshikari@gmail.com>2010-08-04 23:04:05 +0000
committerJason Garrett-Glaser <darkshikari@gmail.com>2010-08-04 23:04:05 +0000
commit905ef0d064d8fb6a349b071c686c4a7fa5a99e07 (patch)
tree3ae8bf7599a298afaaa2b80cf196e8b4cf9d5033 /libavcodec/vp6.c
parentaaa91aa00edddb097cce7fa769db6643de37df11 (diff)
downloadffmpeg-905ef0d064d8fb6a349b071c686c4a7fa5a99e07.tar.gz
VP5/6/8: eliminate CABAC dependency
Create a custom table for VP5/6/8's renorm to avoid depending on H.264's. Saves one instruction in the arithmetic decoder as well. Originally committed as revision 24701 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/vp6.c')
-rw-r--r--libavcodec/vp6.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c
index 9708fbe85c..cc74cf48ea 100644
--- a/libavcodec/vp6.c
+++ b/libavcodec/vp6.c
@@ -87,7 +87,7 @@ static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size,
res = 2;
}
- vp56_init_range_decoder(c, buf+6, buf_size-6);
+ ff_vp56_init_range_decoder(c, buf+6, buf_size-6);
vp56_rac_gets(c, 2);
parse_filter_info = s->filter_header;
@@ -103,7 +103,7 @@ static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size,
buf += 2;
buf_size -= 2;
}
- vp56_init_range_decoder(c, buf+1, buf_size-1);
+ ff_vp56_init_range_decoder(c, buf+1, buf_size-1);
*golden_frame = vp56_rac_get(c);
if (s->filter_header) {
@@ -143,7 +143,7 @@ static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size,
s->parse_coeff = vp6_parse_coeff_huffman;
init_get_bits(&s->gb, buf, buf_size<<3);
} else {
- vp56_init_range_decoder(&s->cc, buf, buf_size);
+ ff_vp56_init_range_decoder(&s->cc, buf, buf_size);
s->ccp = &s->cc;
}
} else {