diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-12 20:26:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:40:34 +0100 |
| commit | 03ea3982275eeaf9811fb816359ee366a5448714 (patch) | |
| tree | c3665e25aafb08cdc693af4676298d2906d0e344 | |
| parent | f6cfd160ca45fa8402336d47199af8dc1ad23b3e (diff) | |
| download | ffmpeg-03ea3982275eeaf9811fb816359ee366a5448714.tar.gz | |
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
(cherry picked from commit 705748caf3f6a4a3e74ad3d2fc547a5a0213a521)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libpostproc/postprocess.c | 2 | ||||
| -rw-r--r-- | tests/ref/lavfi/pp3 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index facfd2cdd9..3a1b78d371 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -1000,7 +1000,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/lavfi/pp3 b/tests/ref/lavfi/pp3 index ccf2eebc62..1af87610c8 100644 --- a/tests/ref/lavfi/pp3 +++ b/tests/ref/lavfi/pp3 @@ -1 +1 @@ -pp3 39af1a30d0ea0e906df264773adfcaa6 +pp3 c8277ef31ab01bad51356841c9634522 |