Re: [libav-devel] [PATCH] mpegvideo_enc: K&R cosmetics

2011-12-24 Thread Diego Biurrun
On Sat, Dec 24, 2011 at 02:00:15AM +0530, Aneesh Dogra wrote: > > --- a/libavcodec/mpegvideo_enc.c > +++ b/libavcodec/mpegvideo_enc.c > @@ -76,23 +78,23 @@ void ff_convert_matrix(DSPContext *dsp, int (*qmat)[64], > uint16_t (*qmat16)[2][6 > } else if (dsp->fdct == fdct_ifast > #ifndef F

Re: [libav-devel] [PATCH] mpegvideo_enc: K&R cosmetics

2011-12-26 Thread Ronald S. Bultje
Hi On Mon, Dec 26, 2011 at 7:31 AM, Aneesh Dogra wrote: > @@ -45,8 +45,8 @@ >  #include "internal.h" >  #include > > -//#undef NDEBUG > -//#include > +// #undef NDEBUG > +// #include Why did you change this? Nobody ever made the comment that this particular case (commented code, as opposed to

Re: [libav-devel] [PATCH] mpegvideo_enc: K&R cosmetics

2011-12-26 Thread Ronald S. Bultje
Hi, On Mon, Dec 26, 2011 at 9:06 AM, Ronald S. Bultje wrote: > On Mon, Dec 26, 2011 at 7:31 AM, Aneesh Dogra wrote: >-if (dsp->fdct == ff_jpeg_fdct_islow_8 || >-dsp->fdct == ff_jpeg_fdct_islow_10 >+if (dsp->fdct == ff_jpeg_fdct_islow_8 || >+dsp->fdct == f

Re: [libav-devel] [PATCH] mpegvideo_enc: K&R cosmetics

2011-12-27 Thread Diego Biurrun
On Tue, Dec 27, 2011 at 11:38:07AM +0530, Aneesh Dogra wrote: > --- > libavcodec/mpegvideo_enc.c | 1027 > +--- > 1 files changed, 585 insertions(+), 442 deletions(-) H... > --- a/libavcodec/mpegvideo_enc.c > +++ b/libavcodec/mpegvideo_enc.c > @@ -59,

Re: [libav-devel] [PATCH] mpegvideo_enc: K&R cosmetics

2011-12-27 Thread Ronald S. Bultje
Hi, On Tue, Dec 27, 2011 at 8:51 AM, Diego Biurrun wrote: > On Tue, Dec 27, 2011 at 11:38:07AM +0530, Aneesh Dogra wrote: >> >> --- a/libavcodec/mpegvideo_enc.c >> +++ b/libavcodec/mpegvideo_enc.c >> @@ -59,157 +59,191 @@ static int dct_quantize_trellis_c(MpegEncContext *s, >> DCTELEM *block, in

Re: [libav-devel] [PATCH] mpegvideo_enc: K&R cosmetics

2011-12-27 Thread Diego Biurrun
On Tue, Dec 27, 2011 at 11:38:07AM +0530, Aneesh Dogra wrote: > > --- a/libavcodec/mpegvideo_enc.c > +++ b/libavcodec/mpegvideo_enc.c > @@ -59,157 +59,191 @@ static int dct_quantize_trellis_c(MpegEncContext *s, > DCTELEM *block, int n, int > > -const int j= dsp->idct_permutation

Re: [libav-devel] [PATCH] mpegvideo_enc: K&R cosmetics

2011-12-27 Thread Diego Biurrun
On Tue, Dec 27, 2011 at 09:01:41AM -0800, Ronald S. Bultje wrote: > On Tue, Dec 27, 2011 at 8:51 AM, Diego Biurrun wrote: > > On Tue, Dec 27, 2011 at 11:38:07AM +0530, Aneesh Dogra wrote: > >> > >> --- a/libavcodec/mpegvideo_enc.c > >> +++ b/libavcodec/mpegvideo_enc.c > >> @@ -59,157 +59,191 @@ st

Re: [libav-devel] [PATCH] mpegvideo_enc: K&R cosmetics

2011-12-27 Thread Derek Buitenhuis
On 27/12/2011 12:07 PM, Diego Biurrun wrote: Possibly. However, such changes under a "K&R cosmetics" heading are unacceptable and rejected. Diego May I remind everyone that Aneesh was told to reformat code in comments too, and at the very least, one or more people agreed it fell under this cl

Re: [libav-devel] [PATCH] mpegvideo_enc: K&R cosmetics

2011-12-27 Thread Ronald S. Bultje
Hi, On Mon, Dec 26, 2011 at 10:08 PM, Aneesh Dogra wrote: > +                uint8_t *dptr = p->f.data[plane] + 8 * (x + y * stride) + > off; > +                uint8_t *rptr = ref->f.data[plane] + 8 * (x + y * sride); stride. There were 1-2 more problems but nothing big, so I fixed them up an

Re: [libav-devel] [PATCH] mpegvideo_enc: K&R cosmetics

2011-12-28 Thread Ronald S. Bultje
Hi, On Tue, Dec 27, 2011 at 1:55 PM, Aneesh Dogra wrote: > -static int estimate_best_b_count(MpegEncContext *s){ > -AVCodec *codec= avcodec_find_encoder(s->avctx->codec_id); > +static int estimate_best_b_count(MpegEncContext *s) [..] This was already included in an earlier patch, please reba

Re: [libav-devel] [PATCH] mpegvideo_enc: K&R cosmetics

2011-12-29 Thread Ronald S. Bultje
Hi, On Wed, Dec 28, 2011 at 11:21 AM, Ronald S. Bultje wrote: > Until line 1615, rest comes in a separate email. > @@ -1615,146 +1705,195 @@ static av_always_inline void > encode_mb_internal(MpegEncContext *s, int motion_x, [..] > +if (s->current_picture.mc_mb_var[s->mb_stride * mb_y + m

Re: [libav-devel] [PATCH] mpegvideo_enc: K&R cosmetics

2011-12-29 Thread Diego Biurrun
On Fri, Dec 30, 2011 at 12:23:54AM +0530, Aneesh Dogra wrote: > > --- a/libavcodec/mpegvideo_enc.c > +++ b/libavcodec/mpegvideo_enc.c > @@ -1114,7 +1114,7 @@ static int estimate_best_b_count(MpegEncContext *s) > //emms_c(); > //s->next_picture_ptr->quality; > p_lambda = s->last_lamb