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-13 18:02:42 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-11-01 17:40:38 +0300
commit17f0581e0dd587c1f7709eb5a6d52311923ed9ca (patch)
treecba0bc5c8fd960e8624d2945ad72c123618c86d3 /libpostproc
parent13b7962aae30e7eb3b6bababab5cc40fe95a4ccc (diff)
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>
Diffstat (limited to 'libpostproc')
-rw-r--r--libpostproc/postprocess.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c
index 54163c8d36..37206c5a48 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;
}