[x264-devel] commit: Fix regression in r850 (Jason Garrett-Glaser )

[git version control]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Tue Jun 10 21:37:57 2008 -0600| [2389de25ff7fe6f84c9c885578c0fbaa6b656f4a]

Fix regression in r850
Bug resulted in rare incorrect chroma encoding

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=2389de25ff7fe6f84c9c885578c0fbaa6b656f4a
---

 encoder/cabac.c |    2 +-
 encoder/cavlc.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/encoder/cabac.c b/encoder/cabac.c
index 93b26d8..d7842b1 100644
--- 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 b0d951d..6213654 100644
--- 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;