ref: 262bc7b280df106995c9df52157aedffa421e388
parent: 8aafd3405081ca178196b5a6250bcbf438c025f5
parent: b7a51cd8941194088837de55df5e2a27981cbc1c
author: James Zern <[email protected]>
date: Tue Jul 1 18:48:15 EDT 2014
Merge "vp8/bitstream.h: quiet warnings in EDSP builds"
--- a/vp8/encoder/bitstream.h
+++ b/vp8/encoder/bitstream.h
@@ -18,7 +18,7 @@
#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 *,
@@ -25,11 +25,11 @@
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) \