Merge "Move eob from BLOCKD to MACROBLOCKD." into experimental

diff --cc vp9/decoder/vp9_decodframe.c
Simple merge

diff --cc vp9/decoder/vp9_idct_blk.c
index 50d874470a41da1b4490a0bb33b3467dd179aea6,c330bf97d2ad833f7248e7e778019f9d8df6ea14..0ec5036e44bcf1c8cbf445ab13eae48c305d0bc7
--- 1/vp9/decoder/vp9_idct_blk.c
--- 2/vp9/decoder/vp9_idct_blk.c
+++ b/vp9/decoder/vp9_idct_blk.c
@@@ -44,10 -44,10 +44,10 @@@ void vp9_dequant_idct_add_y_block_c(int
  
    for (i = 0; i < 4; i++) {
      for (j = 0; j < 4; j++) {
-       if (xd->block[i * 4 + j].eob > 1)
+       if (xd->eobs[i * 4 + j] > 1)
          vp9_dequant_idct_add_c(q, dq, pre, dst, 16, stride);
        else {
 -        vp9_dc_only_idct_add_c(q[0]*dq[0], pre, dst, 16, stride);
 +        vp9_dc_only_idct_add(q[0]*dq[0], pre, dst, 16, stride);
          ((int *)q)[0] = 0;
        }
  
@@@ -69,10 -69,10 +69,10 @@@ void vp9_dequant_idct_add_uv_block_c(in
  
    for (i = 0; i < 2; i++) {
      for (j = 0; j < 2; j++) {
-       if (xd->block[16 + i * 2 + j].eob > 1)
+       if (xd->eobs[16 + i * 2 + j] > 1)
          vp9_dequant_idct_add_c(q, dq, pre, dstu, 8, stride);
        else {
 -        vp9_dc_only_idct_add_c(q[0]*dq[0], pre, dstu, 8, stride);
 +        vp9_dc_only_idct_add(q[0]*dq[0], pre, dstu, 8, stride);
          ((int *)q)[0] = 0;
        }
  
@@@ -87,10 -87,10 +87,10 @@@
  
    for (i = 0; i < 2; i++) {
      for (j = 0; j < 2; j++) {
-       if (xd->block[20 + i * 2 + j].eob > 1)
+       if (xd->eobs[20 + i * 2 + j] > 1)
          vp9_dequant_idct_add_c(q, dq, pre, dstv, 8, stride);
        else {
 -        vp9_dc_only_idct_add_c(q[0]*dq[0], pre, dstv, 8, stride);
 +        vp9_dc_only_idct_add(q[0]*dq[0], pre, dstv, 8, stride);
          ((int *)q)[0] = 0;
        }
  

diff --cc vp9/encoder/vp9_rdopt.c
Simple merge