Fix regression in r850

Bug resulted in rare incorrect chroma encoding

diff --git a/encoder/cabac.c b/encoder/cabac.c
index 93b26d8cf79e202dd4cce8856e929b1192d371fa..d7842b1c2573a9c164955b9d13891bd9d047ff0a 100644 (file)
--- a/encoder/cabac.c
+++ b/encoder/cabac.c
@@ -307,7 +307,7 @@ static void x264_cabac_mb_qp_delta( x264_t *h, x264_cabac_t *cb )
     /* Avoid writing a delta quant if we have an empty i16x16 block, e.g. in a completely flat background area */
     if( h->mb.i_type == I_16x16 && !h->mb.cbp[h->mb.i_mb_xy] )
     {
-#ifndef RD_SKIP_BS
+#ifndef RDO_SKIP_BS
         h->mb.i_qp = h->mb.i_last_qp;
 #endif
         i_dqp = 0;

diff --git a/encoder/cavlc.c b/encoder/cavlc.c
index b0d951dffb6bd924ed4f015187d430f57393430e..6213654751a9228e559ac26a6df20dbb6161b9f3 100644 (file)
--- a/encoder/cavlc.c
+++ b/encoder/cavlc.c
@@ -225,7 +225,7 @@ static void cavlc_qp_delta( x264_t *h, bs_t *s )
     if( h->mb.i_type == I_16x16 && !(h->mb.i_cbp_luma | h->mb.i_cbp_chroma)
         && !array_non_zero(h->dct.luma16x16_dc) )
     {
-#ifndef RD_SKIP_BS
+#ifndef RDO_SKIP_BS
         h->mb.i_qp = h->mb.i_last_qp;
 #endif
         i_dqp = 0;