]> granicus.if.org Git - libvpx/commitdiff
Merge "Add const before the dequant(dq)" into experimental
authorYunqing Wang <yunqingwang@google.com>
Fri, 16 Nov 2012 20:35:17 +0000 (12:35 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 16 Nov 2012 20:35:17 +0000 (12:35 -0800)
1  2 
vp9/common/rtcd_defs.sh
vp9/decoder/dequantize.c
vp9/decoder/idct_blk.c

Simple merge
Simple merge
index f18c49b900712515f9add193c1bc5accfbb29262,998a211879a416a8ebc8788c8b5bf03525cc55f6..7805aa09eb4fe95af95c58b547b408092bff9901
@@@ -8,10 -8,10 +8,10 @@@
   *  be found in the AUTHORS file in the root of the source tree.
   */
  
 -#include "vpx_rtcd.h"
 +#include "vp9_rtcd.h"
  #include "vp9/common/idct.h"
  
- void vp9_dequant_dc_idct_add_y_block_c(short *q, short *dq,
+ void vp9_dequant_dc_idct_add_y_block_c(short *q, const short *dq,
                                         unsigned char *pre,
                                         unsigned char *dst,
                                         int stride, unsigned short *eobs,