Merge commit '27852f2f1dec3749ea79883b70484c841169f747'

[ffmpeg] / libpostproc / postprocess_template.c

diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c
index 4016b08a37d948da88493e31f01d8f3a40221da1..16e441afe97b0f34202d3a137583feac5e03c09a 100644 (file)
--- a/libpostproc/postprocess_template.c
+++ b/libpostproc/postprocess_template.c
@@ -3529,16 +3529,12 @@ static void RENAME(postProcess)(const uint8_t src[], int srcStride, uint8_t dst[
 
           for(x = startx; x < endx; x+=BLOCK_SIZE){
             const int stride= dstStride;
-
-            if(isColor){
-                QP= QPptr[x>>qpHShift];
-                c.nonBQP= nonBQPptr[x>>qpHShift];
-            }else{
-                QP= QPptr[x>>4];
+            QP = QPptr[x>>qpHShift];
+            c.nonBQP = nonBQPptr[x>>qpHShift];
+            if(!isColor){
                 QP= (QP* QPCorrecture + 256*128)>>16;
-                c.nonBQP= nonBQPptr[x>>4];
                 c.nonBQP= (c.nonBQP* QPCorrecture + 256*128)>>16;
-                yHistogram[ srcBlock[srcStride*12 + 4] ]++;
+                yHistogram[srcBlock[srcStride*12 + 4]]++;
             }
             c.QP= QP;
 #if TEMPLATE_PP_MMX