Simplify left_xy init
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Jan 2010 00:15:55 +0000 (00:15 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Jan 2010 00:15:55 +0000 (00:15 +0000)
Originally committed as revision 21470 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/h264.h

index 2e6a6b9..e03e0e4 100644 (file)
@@ -1144,16 +1144,14 @@ static int fill_filter_caches(H264Context *h, int mb_type){
         const int curr_mb_field_flag     = IS_INTERLACED(mb_type);
         if(s->mb_y&1){
             if (left_mb_field_flag != curr_mb_field_flag) {
-                left_xy[0] = mb_xy - s->mb_stride - 1;
-                left_xy[1] = mb_xy                - 1;
+                left_xy[0] -= s->mb_stride;
             }
         }else{
             if(curr_mb_field_flag){
                 top_xy      += s->mb_stride & (((s->current_picture.mb_type[top_xy    ]>>7)&1)-1);
             }
             if (left_mb_field_flag != curr_mb_field_flag) {
-                left_xy[0] = mb_xy                - 1;
-                left_xy[1] = mb_xy + s->mb_stride - 1;
+                left_xy[1] += s->mb_stride;
             }
         }
     }