[Ffmpeg-cvslog] r5650 - trunk/libavcodec/vc1.c

[kostya]

Author: kostya
Date: Fri Jul  7 06:50:13 2006
New Revision: 5650

Modified:
   trunk/libavcodec/vc1.c

Log:
Don't read out-of-bounds values.


Modified: trunk/libavcodec/vc1.c
==============================================================================
--- trunk/libavcodec/vc1.c	(original)
+++ trunk/libavcodec/vc1.c	Fri Jul  7 06:50:13 2006
@@ -2511,7 +2511,8 @@
                 int intrapred = 0;
                 for(i=0; i<6; i++)
                     if(is_intra[i]) {
-                        if(v->mb_type[0][s->block_index[i] - s->block_wrap[i]] || v->mb_type[0][s->block_index[i] - 1]) {
+                        if(((s->mb_y || (i==2 || i==3)) && v->mb_type[0][s->block_index[i] - s->block_wrap[i]])
+                             || ((s->mb_x || (i==1 || i==3)) && v->mb_type[0][s->block_index[i] - 1])) {
                             intrapred = 1;
                             break;
                         }