Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-12 22:26:27 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-11-01 17:40:38 +0300
commit13b7962aae30e7eb3b6bababab5cc40fe95a4ccc (patch)
tree0d549c87d27b3ce49a3d68088325149200f7b013
parentaa40f11b815a9a26aaa46198342749866fa18b27 (diff)
postproc/postprocess: fix quant store for fq mode
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 941aaa39e8cd78ba4d16dfcec767290aec9a0136) Conflicts: tests/ref/fate/filter-pp3
-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 da586ffd31..54163c8d36 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 ccf2eebc62..1af87610c8 100644
--- a/tests/ref/fate/filter-pp3
+++ b/tests/ref/fate/filter-pp3
@@ -1 +1 @@
-pp3 39af1a30d0ea0e906df264773adfcaa6
+pp3 c8277ef31ab01bad51356841c9634522