@@ -1290,28 +1290,26 @@ static int ff_estimate_motion_b(MpegEncContext * s,

         break;

     case ME_X1:

     case ME_EPZS:

-       {

-            P_LEFT[0]        = mv_table[mot_xy - 1][0];

-            P_LEFT[1]        = mv_table[mot_xy - 1][1];

-

-            if(P_LEFT[0]       > (c->xmax<<shift)) P_LEFT[0]       = (c->xmax<<shift);

+        P_LEFT[0] = mv_table[mot_xy - 1][0];

+        P_LEFT[1] = mv_table[mot_xy - 1][1];

-            /* special case for first line */

-            if (!s->first_slice_line) {

-                P_TOP[0] = mv_table[mot_xy - mot_stride             ][0];

-                P_TOP[1] = mv_table[mot_xy - mot_stride             ][1];

-                P_TOPRIGHT[0] = mv_table[mot_xy - mot_stride + 1         ][0];

-                P_TOPRIGHT[1] = mv_table[mot_xy - mot_stride + 1         ][1];

-                if(P_TOP[1] > (c->ymax<<shift)) P_TOP[1]= (c->ymax<<shift);

-                if(P_TOPRIGHT[0] < (c->xmin<<shift)) P_TOPRIGHT[0]= (c->xmin<<shift);

-                if(P_TOPRIGHT[1] > (c->ymax<<shift)) P_TOPRIGHT[1]= (c->ymax<<shift);

+        if (P_LEFT[0] > (c->xmax << shift)) P_LEFT[0] = (c->xmax << shift);

-                P_MEDIAN[0]= mid_pred(P_LEFT[0], P_TOP[0], P_TOPRIGHT[0]);

-                P_MEDIAN[1]= mid_pred(P_LEFT[1], P_TOP[1], P_TOPRIGHT[1]);

-            }

-            c->pred_x= P_LEFT[0];

-            c->pred_y= P_LEFT[1];

+        /* special case for first line */

+        if (!s->first_slice_line) {

+            P_TOP[0]      = mv_table[mot_xy - mot_stride    ][0];

+            P_TOP[1]      = mv_table[mot_xy - mot_stride    ][1];

+            P_TOPRIGHT[0] = mv_table[mot_xy - mot_stride + 1][0];

+            P_TOPRIGHT[1] = mv_table[mot_xy - mot_stride + 1][1];

+            if (P_TOP[1] > (c->ymax << shift)) P_TOP[1] = (c->ymax << shift);

+            if (P_TOPRIGHT[0] < (c->xmin << shift)) P_TOPRIGHT[0] = (c->xmin << shift);

+            if (P_TOPRIGHT[1] > (c->ymax << shift)) P_TOPRIGHT[1] = (c->ymax << shift);

+

+            P_MEDIAN[0] = mid_pred(P_LEFT[0], P_TOP[0], P_TOPRIGHT[0]);

+            P_MEDIAN[1] = mid_pred(P_LEFT[1], P_TOP[1], P_TOPRIGHT[1]);

         }

+        c->pred_x = P_LEFT[0];

+        c->pred_y = P_LEFT[1];

         if(mv_table == s->b_forw_mv_table){

             mv_scale= (s->pb_time<<16) / (s->pp_time<<shift);

@@ -96,10 +96,8 @@ static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)

         for (i = 0; i < h>>vsub; i++) {

             switch (step) {

             case 1:

-            {

                 for (j = 0; j < (inlink->w >> hsub); j++)

                     outrow[j] = inrow[-j];

-            }

             break;

             case 2:

@@ -99,7 +99,6 @@ yuv2planeX_altivec(const int16_t *filter, int filterSize,

                    const uint8_t *dither, int offset)

 {

     register int i, j;

-    {

         DECLARE_ALIGNED(16, int, val)[dstW];

         for (i=0; i<dstW; i++)

@@ -142,7 +141,6 @@ yuv2planeX_altivec(const int16_t *filter, int filterSize,

             }

         }

         altivec_packIntArrayToCharArray(val, dest, dstW);

-    }

 }

 static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW,

@@ -166,7 +164,6 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW,

     else

     switch (filterSize) {

     case 4:

-    {

     for (i=0; i<dstW; i++) {

         register int srcPos = filterPos[i];

@@ -201,11 +198,9 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW,

         vec_st(val_s, 0, tempo);

         dst[i] = FFMIN(tempo[3]>>7, (1<<15)-1);

     }

-    }

     break;

     case 8:

-    {

     for (i=0; i<dstW; i++) {

         register int srcPos = filterPos[i];

@@ -228,11 +223,9 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW,

         vec_st(val_s, 0, tempo);

         dst[i] = FFMIN(tempo[3]>>7, (1<<15)-1);

     }

-    }

     break;

     case 16:

-    {

         for (i=0; i<dstW; i++) {

             register int srcPos = filterPos[i];

@@ -257,11 +250,9 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW,

             vec_st(val_s, 0, tempo);

             dst[i] = FFMIN(tempo[3]>>7, (1<<15)-1);

         }

-    }

     break;

     default:

-    {

     for (i=0; i<dstW; i++) {

         register int j;

         register int srcPos = filterPos[i];

@@ -321,7 +312,6 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW,

     }

     }

-    }

 }

 void ff_sws_init_swScale_altivec(SwsContext *c)