On Sun, Oct 13, 2013 at 08:06:34AM +0200, Luca Barbato wrote:
> --- a/libavcodec/mpegvideo_motion.c
> +++ b/libavcodec/mpegvideo_motion.c
> @@ -390,40 +424,40 @@ static inline void put_obmc(uint8_t *dst, uint8_t
> *src[5], int stride){
>
> - OBMC_FILTER (x , 2, 2, 4, 0, 0);
> - OBMC_FILTER (x+1, 2, 1, 5, 0, 0);
> - OBMC_FILTER4(x+2, 2, 1, 5, 0, 0);
> - OBMC_FILTER4(x+4, 2, 0, 5, 1, 0);
> - OBMC_FILTER (x+6, 2, 0, 5, 1, 0);
> - OBMC_FILTER (x+7, 2, 0, 4, 2, 0);
> + OBMC_FILTER (x , 2, 2, 4, 0, 0);
> + OBMC_FILTER (x + 1, 2, 1, 5, 0, 0);
> + OBMC_FILTER4(x + 2, 2, 1, 5, 0, 0);
> + OBMC_FILTER4(x + 4, 2, 0, 5, 1, 0);
> + OBMC_FILTER (x + 6, 2, 0, 5, 1, 0);
> + OBMC_FILTER (x + 7, 2, 0, 4, 2, 0);
No spaces before comma please.
> @@ -431,22 +465,21 @@ static inline void obmc_motion(MpegEncContext *s,
> uint8_t *dest, uint8_t *src,
> int src_x, int src_y,
> op_pixels_func *pix_op,
> - int16_t mv[5][2]/* mid top left right
> bottom*/)
> + int16_t mv[5][2] /* mid top left right
> bottom*/)
missing space before *
> @@ -465,83 +501,87 @@ static inline void qpel_motion(MpegEncContext *s,
>
> - dxy = ((motion_y & 3) << 2) | (motion_x & 3);
> - src_x = s->mb_x * 16 + (motion_x >> 2);
> + dxy = ((motion_y & 3) << 2) | (motion_x & 3);
> + src_x = s->mb_x * 16 + (motion_x >> 2);
> src_y = s->mb_y * (16 >> field_based) + (motion_y >> 2);
>
> - uvsrc_x = s->mb_x * 8 + mx;
> + uvsrc_x = s->mb_x * 8 + mx;
> uvsrc_y = s->mb_y * (8 >> field_based) + my;
>
> - ptr_y = ref_picture[0] + src_y * linesize + src_x;
> + ptr_y = ref_picture[0] + src_y * linesize + src_x;
> ptr_cb = ref_picture[1] + uvsrc_y * uvlinesize + uvsrc_x;
> ptr_cr = ref_picture[2] + uvsrc_y * uvlinesize + uvsrc_x;
prolly some of that vertical alignment could be preserved.
I assume this was not run through uncrustify?
Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
