ref: 32705df40983b17a0bfe46c370fe2c3ee03b59fa
parent: b9419f02a4333da10d3b29aa6ab36cd4ebb82c3f
parent: 501fce727095ed0fb403dbba83b18b205d39b70e
author: Yaowu Xu <yaowu@google.com>
date: Mon Mar 3 03:36:00 EST 2014
Merge "vp9_decodeframe.c: remove unused params"
--- a/vp9/decoder/vp9_decodeframe.c
+++ b/vp9/decoder/vp9_decodeframe.c
@@ -1087,7 +1087,7 @@
}
}
-static void error_handler(void *data, size_t bit_offset) {
+static void error_handler(void *data) {
VP9_COMMON *const cm = (VP9_COMMON *)data;
vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME, "Truncated packet");
}
--- a/vp9/decoder/vp9_read_bit_buffer.h
+++ b/vp9/decoder/vp9_read_bit_buffer.h
@@ -19,7 +19,7 @@
extern "C" {
#endif
-typedef void (*vp9_rb_error_handler)(void *data, size_t bit_offset);
+typedef void (*vp9_rb_error_handler)(void *data);
struct vp9_read_bit_buffer {
const uint8_t *bit_buffer;
@@ -39,7 +39,7 @@
const size_t p = off / CHAR_BIT;
const int q = CHAR_BIT - 1 - (int)off % CHAR_BIT;
if (rb->bit_buffer + p >= rb->bit_buffer_end) {
- rb->error_handler(rb->error_handler_data, rb->bit_offset);
+ rb->error_handler(rb->error_handler_data);
return 0;
} else {
const int bit = (rb->bit_buffer[p] & (1 << q)) >> q;
--
⑨