aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitor Sessak <vitor1001@gmail.com>2009-03-04 16:56:55 +0000
committerVitor Sessak <vitor1001@gmail.com>2009-03-04 16:56:55 +0000
commita66430c0d02178c033d892b96fb84f28665ec96f (patch)
tree375d996f57d7b8984b9e4f2471b4c5a9103371ab
parent34e46c44dafd32a7519382f0647b8afab88d57a7 (diff)
downloadffmpeg-a66430c0d02178c033d892b96fb84f28665ec96f.tar.gz
Add more correct bound checking in filter_mb().
Should fix decoding of CVMAPAQP3_Sony_E.jsv in MinGW Originally committed as revision 17806 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h264.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 19725e7986..0e1690d7de 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -6493,7 +6493,7 @@ static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8
int qp = s->current_picture.qscale_table[mb_xy];
if(qp <= qp_thresh
&& (mb_x == 0 || ((qp + s->current_picture.qscale_table[mb_xy-1] + 1)>>1) <= qp_thresh)
- && (mb_y == 0 || ((qp + s->current_picture.qscale_table[h->top_mb_xy] + 1)>>1) <= qp_thresh)){
+ && (h->top_mb_xy < 0 || ((qp + s->current_picture.qscale_table[h->top_mb_xy] + 1)>>1) <= qp_thresh)){
return;
}
}