Fix regression in r922

set the chroma DC coefficients to zero for residual coding in qpel-rd
fix C99ism

diff --git a/encoder/cabac.c b/encoder/cabac.c
index c301f65ca7bae0b9c9d7c892c061292ed995e96e..78736ff6819f039b013c1b1a786618fb72a18164 100644 (file)
--- a/encoder/cabac.c
+++ b/encoder/cabac.c
@@ -730,10 +730,12 @@ static void block_residual_write_cabac( x264_t *h, x264_cabac_t *cb, int i_ctxBl
 
     do
     {
+        int i_prefix, ctx;
         i_coeff--;
+
         /* write coeff_abs - 1 */
-        int i_prefix = X264_MIN( i_coeff_abs_m1[i_coeff], 14 );
-        int ctx = coeff_abs_level1_ctx[node_ctx] + i_ctx_level;
+        i_prefix = X264_MIN( i_coeff_abs_m1[i_coeff], 14 );
+        ctx = coeff_abs_level1_ctx[node_ctx] + i_ctx_level;
 
         if( i_prefix )
         {

diff --git a/encoder/macroblock.c b/encoder/macroblock.c
index 593e30cc08bba0998296cdb055e48167a6096787..51c56840361f474665ed98cb6520e0a20d645c6a 100644 (file)
--- a/encoder/macroblock.c
+++ b/encoder/macroblock.c
@@ -809,6 +809,7 @@ void x264_macroblock_encode_p8x8( x264_t *h, int i8 )
         h->dctf.sub4x4_dct( dct4x4, p_fenc, p_fdec );
         h->quantf.quant_4x4( dct4x4, h->quant4_mf[CQM_4PC][i_qp], h->quant4_bias[CQM_4PC][i_qp] );
         h->zigzagf.scan_4x4( h->dct.luma4x4[16+i8+ch*4], dct4x4 );
+        h->dct.luma4x4[16+i8+ch*4][0] = 0;
         if( array_non_zero( dct4x4 ) )
         {
             h->quantf.dequant_4x4( dct4x4, h->dequant4_mf[CQM_4PC], i_qp );