From 905ef0d064d8fb6a349b071c686c4a7fa5a99e07 Mon Sep 17 00:00:00 2001 From: Jason Garrett-Glaser Date: Wed, 4 Aug 2010 23:04:05 +0000 Subject: 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 --- libavcodec/vp6.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavcodec/vp6.c') 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 { -- cgit v1.2.3