changeset 10976:86e9bd7dd192

Merge with stable
author Ashok Kumar Mishra <ashok@multicorewareinc.com>
date Tue, 01 Sep 2015 17:06:05 +0530
parents 86b915fdd88a (current diff) 01666824db65 (diff)
children 44cc2ce22c43
files source/common/quant.cpp
diffstat 1 files changed, 2 insertions(+-), 0 deletions(-) [+]
line wrap: on
line diff
--- a/source/common/quant.cpp	Tue Sep 01 14:07:58 2015 +0530
+++ b/source/common/quant.cpp	Tue Sep 01 17:06:05 2015 +0530
@@ -228,6 +228,8 @@ Quant::~Quant()
 
 void Quant::setQPforQuant(const CUData& ctu, int qp)
 {
+    m_tqBypass = !!ctu.m_tqBypass[0];
+
     m_nr = m_frameNr ? &m_frameNr[ctu.m_encData->m_frameEncoderID] : NULL;
     m_qpParam[TEXT_LUMA].setQpParam(qp + QP_BD_OFFSET);
     setChromaQP(qp + ctu.m_slice->m_pps->chromaQpOffset[0], TEXT_CHROMA_U, ctu.m_chromaFormat);