aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-12 20:26:27 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-11-01 13:28:13 +0100
commit5a1efc7b8585da037d8c603cf6d1c38d5b9a4cf9 (patch)
treebd5d094d08881838522f640df2b977837b2a961e
parent71af22097d33b9133265977a113bc732bf42ede5 (diff)
downloadffmpeg-5a1efc7b8585da037d8c603cf6d1c38d5b9a4cf9.tar.gz
postproc/postprocess: fix quant store for fq mode
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 941aaa39e8cd78ba4d16dfcec767290aec9a0136) 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 01ec0f9867..ab12e59086 100644
--- a/libpostproc/postprocess.c
+++ b/libpostproc/postprocess.c
@@ -1004,7 +1004,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