diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-13 16:02:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-01 13:28:13 +0100 |
| commit | bf7ee2524b8db7207035309b36cafa9f1a48d5b0 (patch) | |
| tree | 803228b67d0f79ba7eee9c895173bc8a196bf7e9 | |
| parent | 5a1efc7b8585da037d8c603cf6d1c38d5b9a4cf9 (diff) | |
| download | ffmpeg-bf7ee2524b8db7207035309b36cafa9f1a48d5b0.tar.gz | |
postproc: fix qp count
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0b7e5d0d75e7d8762dd04d35f8c0821736164372)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libpostproc/postprocess.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index ab12e59086..670908ca9f 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -979,7 +979,7 @@ void pp_postprocess(const uint8_t * src[3], const int srcStride[3], if(pict_type & PP_PICT_TYPE_QP2){ int i; - const int count= mbHeight * absQPStride; + const int count= FFMAX(mbHeight * absQPStride, mbWidth); for(i=0; i<(count>>2); i++){ ((uint32_t*)c->stdQPTable)[i] = (((const uint32_t*)QP_store)[i]>>1) & 0x7F7F7F7F; } @@ -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 * FFMAX(QPStride, mbWidth); + const int count= FFMAX(mbHeight * QPStride, mbWidth); for(i=0; i<(count>>2); i++){ ((uint32_t*)c->nonBQPTable)[i] = ((const uint32_t*)QP_store)[i] & 0x3F3F3F3F; } |