[x264-devel] commit: Fix bug with PCM and adaptive quantization (Jason Garrett-Glaser )

[git version control]

x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Fri Jul 11 22:53:27 2008 -0600| [0976ead3dd6641d88de51dbbdfd82f8d3079a458]

Fix bug with PCM and adaptive quantization
In rare cases CABAC desync could occur, causing bitstream corruption

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

 common/macroblock.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/common/macroblock.c b/common/macroblock.c
index 564761d..48cf1cd 100644
--- a/common/macroblock.c
+++ b/common/macroblock.c
@@ -1397,7 +1397,7 @@ void x264_macroblock_cache_save( x264_t *h )
 
     h->mb.type[i_mb_xy] = i_mb_type;
 
-    if( h->mb.i_type != I_16x16 && h->mb.i_cbp_luma == 0 && h->mb.i_cbp_chroma == 0 )
+    if( h->mb.i_type == I_PCM || (h->mb.i_type != I_16x16 && h->mb.i_cbp_luma == 0 && h->mb.i_cbp_chroma == 0) )
         h->mb.i_qp = h->mb.i_last_qp;
     h->mb.qp[i_mb_xy] = i_mb_type != I_PCM ? h->mb.i_qp : 0;