On Wed, 18 Jan 2012, Diego Biurrun wrote:
--- libavcodec/motion_est.c | 36 +++++++++++++++++------------------- libavfilter/vf_hflip.c | 2 -- libswscale/ppc/swscale_altivec.c | 10 ---------- 3 files changed, 17 insertions(+), 31 deletions(-)diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index c4512a9..2aa8978 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -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); diff --git a/libavfilter/vf_hflip.c b/libavfilter/vf_hflip.c index fb8911f..c92296e 100644 --- a/libavfilter/vf_hflip.c +++ b/libavfilter/vf_hflip.c @@ -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: diff --git a/libswscale/ppc/swscale_altivec.c b/libswscale/ppc/swscale_altivec.c index 87059d9..13c63e8 100644 --- a/libswscale/ppc/swscale_altivec.c +++ b/libswscale/ppc/swscale_altivec.c @@ -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); - } }
You said you were going to do this in a separate patch? If you keep it in the same, it'd make more sense to reindent this part too at the same time.
// Martin _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
