summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2014-07-01 22:48:15 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-07-01 22:48:15 -0700
commit262bc7b280df106995c9df52157aedffa421e388 (patch)
tree872356fa6d222d006337b67d4316ce65d6d7e28f
parent8aafd3405081ca178196b5a6250bcbf438c025f5 (diff)
parentb7a51cd8941194088837de55df5e2a27981cbc1c (diff)
downloadlibvpx-262bc7b280df106995c9df52157aedffa421e388.tar
libvpx-262bc7b280df106995c9df52157aedffa421e388.tar.gz
libvpx-262bc7b280df106995c9df52157aedffa421e388.tar.bz2
libvpx-262bc7b280df106995c9df52157aedffa421e388.zip
Merge "vp8/bitstream.h: quiet warnings in EDSP builds"
-rw-r--r--vp8/encoder/bitstream.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/vp8/encoder/bitstream.h b/vp8/encoder/bitstream.h
index eef2d79e0..66f4bf67e 100644
--- a/vp8/encoder/bitstream.h
+++ b/vp8/encoder/bitstream.h
@@ -18,18 +18,18 @@ extern "C" {
#if HAVE_EDSP
void vp8cx_pack_tokens_armv5(vp8_writer *w, const TOKENEXTRA *p, int xcount,
- const vp8_token *,
+ vp8_token *,
const vp8_extra_bit_struct *,
const vp8_tree_index *);
void vp8cx_pack_tokens_into_partitions_armv5(VP8_COMP *,
unsigned char * cx_data,
const unsigned char *cx_data_end,
int num_parts,
- const vp8_token *,
+ vp8_token *,
const vp8_extra_bit_struct *,
const vp8_tree_index *);
void vp8cx_pack_mb_row_tokens_armv5(VP8_COMP *cpi, vp8_writer *w,
- const vp8_token *,
+ vp8_token *,
const vp8_extra_bit_struct *,
const vp8_tree_index *);
# define pack_tokens(a,b,c) \