aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-12 20:26:27 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-12 22:22:39 +0200
commit941aaa39e8cd78ba4d16dfcec767290aec9a0136 (patch)
tree6e095621724bade93dbcb746fd24c9636e09fee8
parent9a460db63be7f24768edea48dc94b8a754068efd (diff)
downloadffmpeg-941aaa39e8cd78ba4d16dfcec767290aec9a0136.tar.gz
postproc/postprocess: fix quant store for fq mode
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libpostproc/postprocess.c2
-rw-r--r--tests/ref/fate/filter-pp32
2 files changed, 2 insertions, 2 deletions
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index bb6a3b4e61..e3fc2675a1 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 00d4595f37..c2f2b4cb16 100644
--- a/tests/ref/fate/filter-pp3
+++ b/tests/ref/fate/filter-pp3
@@ -1 +1 @@
-pp3 f38fdc2dfa4c8d889918efe6d7a7ac3a
+pp3 ef0f10f1859af2f75717e8c9d64ee38a