diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index bb6a3b4e614702483fc014542ab0508c7316e5b3..e3fc2675a121d1604688807d229ed2afa2ee2b1f 100644
--- a/libpostproc/postprocess.c
+++ b/libpostproc/postprocess.c
@@ -1019,7 +1019,7 @@ void  pp_postprocess(const uint8_t * src[3], const int srcStride[3],
     if((pict_type&7)!=3){
         if (QPStride >= 0){
             int i;
-            const int count= mbHeight * QPStride;
+            const int count= mbHeight * FFMAX(QPStride, mbWidth);
             for(i=0; i<(count>>2); i++){
                 ((uint32_t*)c->nonBQPTable)[i] = ((const uint32_t*)QP_store)[i] & 0x3F3F3F3F;
             }
diff --git a/tests/ref/fate/filter-pp3 b/tests/ref/fate/filter-pp3
index 00d4595f37f47cd3bc4901508d4656090570dfe5..c2f2b4cb16897c26656f0519d02dc12e1403b715 100644
--- a/tests/ref/fate/filter-pp3
+++ b/tests/ref/fate/filter-pp3
@@ -1 +1 @@
-pp3                 f38fdc2dfa4c8d889918efe6d7a7ac3a
+pp3                 ef0f10f1859af2f75717e8c9d64ee38a