[x264-devel] commit: Fix regression in r1666 (Oskar Arvidsson )

[git at videolan.org]

x264 | branch: stable | Oskar Arvidsson <oskar at irock.se> | Thu Jul 15 14:01:36 2010 +0200| [2484aa0b360647dbe0b63f9876566f670d7dcc49] | committer: Jason Garrett-Glaser 

Fix regression in r1666
Broke encoding of PCM macroblocks.

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

 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 e82d7e9..9cc8a7f 100644
--- a/encoder/cabac.c
+++ b/encoder/cabac.c
@@ -772,7 +772,7 @@ void x264_macroblock_write_cabac( x264_t *h, x264_cabac_t *cb )
 
         for( int i = 0; i < 256; i++ )
             bs_write( &s, BIT_DEPTH, h->mb.pic.p_fenc[0][i] );
-        for( int ch = 0; ch < 2; ch++ )
+        for( int ch = 1; ch < 3; ch++ )
             for( int i = 0; i < 8; i++ )
                 for( int j = 0; j < 8; j++ )
                     bs_write( &s, BIT_DEPTH, h->mb.pic.p_fenc[ch][i*FENC_STRIDE+j] );
diff --git a/encoder/cavlc.c b/encoder/cavlc.c
index 632ed41..6f0b60f 100644
--- a/encoder/cavlc.c
+++ b/encoder/cavlc.c
@@ -311,7 +311,7 @@ void x264_macroblock_write_cavlc( x264_t *h )
 
         for( int i = 0; i < 256; i++ )
             bs_write( s, BIT_DEPTH, h->mb.pic.p_fenc[0][i] );
-        for( int ch = 0; ch < 2; ch++ )
+        for( int ch = 1; ch < 3; ch++ )
             for( int i = 0; i < 8; i++ )
                 for( int j = 0; j < 8; j++ )
                     bs_write( s, BIT_DEPTH, h->mb.pic.p_fenc[ch][i*FENC_STRIDE+j] );