On Mon, Oct 28, 2013 at 06:31:07PM +0100, Vittorio Giovara wrote:
> --- a/libavcodec/mpeg4video.c
> +++ b/libavcodec/mpeg4video.c
> @@ -44,70 +45,72 @@ void ff_mpeg4_clean_buffers(MpegEncContext *s)
> /* clean AC */
> - memset(s->ac_val[0] + l_xy, 0, (l_wrap*2+1)*16*sizeof(int16_t));
> - memset(s->ac_val[1] + c_xy, 0, (c_wrap +1)*16*sizeof(int16_t));
> - memset(s->ac_val[2] + c_xy, 0, (c_wrap +1)*16*sizeof(int16_t));
> + memset(s->ac_val[0] + l_xy, 0, (l_wrap * 2 + 1) * 16 * sizeof(int16_t));
> + memset(s->ac_val[1] + c_xy, 0, (c_wrap + 1) * 16 * sizeof(int16_t));
> + memset(s->ac_val[2] + c_xy, 0, (c_wrap + 1) * 16 * sizeof(int16_t));
The prettyprinting could be maintained here.
> s->mv[0][i][0] = s->direct_scale_mv[0][p_mx + tab_bias] + mx;
> - s->mv[1][i][0] = mx ? s->mv[0][i][0] - p_mx
> - : s->direct_scale_mv[1][p_mx + tab_bias];
> + s->mv[1][i][0] = mx ? s->mv[0][i][0] - p_mx :
> + s->direct_scale_mv[1][p_mx + tab_bias];
This is quite a readable way to format ?: expressions, let's maintain it.
More below ...
> @@ -128,43 +132,42 @@ int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx,
> int my){
> --- a/libavcodec/mpeg4video.h
> +++ b/libavcodec/mpeg4video.h
> @@ -85,18 +85,18 @@ extern const uint16_t ff_mpeg4_resync_prefix[8];
>
> extern const uint8_t ff_mpeg4_dc_threshold[8];
>
> -void ff_mpeg4_encode_mb(MpegEncContext *s,
> +void ff_mpeg4_encode_mb(MpegEncContext * s,
This was correct before.
> @@ -128,7 +126,7 @@ extern uint8_t
> ff_mpeg4_static_rl_table_store[3][2][2*MAX_RUN + MAX_LEVEL + 3];
> * @param n block index (0-3 are luma, 4-5 are chroma)
> * @param dir_ptr pointer to an integer where the prediction direction will
> be stored
> */
> -static inline int ff_mpeg4_pred_dc(MpegEncContext * s, int n, int level, int
> *dir_ptr, int encoding)
> +static inline int ff_mpeg4_pred_dc(MpegEncContext *s, int n, int level, int
> *dir_ptr, int encoding)
This long line could be broken.
I'll queue this with all that fixed.
Diego
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
