ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Sun Oct
12 20:26:27 2014 +0200| [13b7962aae30e7eb3b6bababab5cc40fe95a4ccc] | committer:
Michael Niedermayer
postproc/postprocess: fix quant store for fq mode
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
(cherry picked from commit 941aaa39e8cd78ba4d16dfcec767290aec9a0136)
Conflicts:
tests/ref/fate/filter-pp3
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=13b7962aae30e7eb3b6bababab5cc40fe95a4ccc
---
libpostproc/postprocess.c | 2 +-
tests/ref/fate/filter-pp3 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index da586ff..54163c8 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 ccf2eeb..1af8761 100644
--- a/tests/ref/fate/filter-pp3
+++ b/tests/ref/fate/filter-pp3
@@ -1 +1 @@
-pp3 39af1a30d0ea0e906df264773adfcaa6
+pp3 c8277ef31ab01bad51356841c9634522
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
