[FFmpeg-cvslog] r17806 - trunk/libavcodec/h264.c

[vitor]

Author: vitor
Date: Wed Mar  4 17:56:55 2009
New Revision: 17806

Log:
Add more correct bound checking in filter_mb().

Should fix decoding of CVMAPAQP3_Sony_E.jsv in MinGW

Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	Wed Mar  4 17:52:37 2009	(r17805)
+++ trunk/libavcodec/h264.c	Wed Mar  4 17:56:55 2009	(r17806)
@@ -6493,7 +6493,7 @@ static void filter_mb( H264Context *h, i
         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;
         }
     }