[FFmpeg-devel] [PATCH] avfilter/motion_estimation: Fix pre processor formating

[Michael Niedermayer]

On Fri, Aug 26, 2016 at 04:00:09PM -0300, James Almer wrote:
> On 8/26/2016 3:19 PM, Michael Niedermayer wrote:
> > IIRC, The spaces are not standard before the #
> 
> We use them sometimes when nesting several preprocessor checks,

spaces after the # are standard IIRC, before they are not but maybe
i misremember


> but in this case yes, it should have no spaces.
> 
> > 
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> >  libavfilter/motion_estimation.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/libavfilter/motion_estimation.c b/libavfilter/motion_estimation.c
> > index fa6f49d..0f9ba21 100644
> > --- a/libavfilter/motion_estimation.c
> > +++ b/libavfilter/motion_estimation.c
> > @@ -262,10 +262,10 @@ uint64_t ff_me_search_ds(AVMotionEstContext *me_ctx, int x_mb, int y_mb, int *mv
> >          x = mv[0];
> >          y = mv[1];
> >  
> > -    #if 1
> > +#if 1
> >          for (i = 0; i < 8; i++)
> >              COST_P_MV(x + dia2[i][0], y + dia2[i][1]);
> > -    #else
> > +#else
> >          /* this version skips previously examined 3 or 5 locations based on prev origin */
> >          if (dir_x <= 0)
> >              COST_P_MV(x - 2, y);
> > @@ -286,7 +286,7 @@ uint64_t ff_me_search_ds(AVMotionEstContext *me_ctx, int x_mb, int y_mb, int *mv
> >  
> >          dir_x = mv[0] - x;
> >          dir_y = mv[1] - y;
> > -    #endif
> > +#endif
> >  
> >      } while (x != mv[0] || y != mv[1]);
> >  
> > 
> 
> LGTM, assuming the disabled code has a reason to be there.

yes its probably faster

applied

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Awnsering whenever a program halts or runs forever is
On a turing machine, in general impossible (turings halting problem).
On any real computer, always possible as a real computer has a finite number
of states N, and will either halt in less than N cycles or never halt.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20160826/1d27e800/attachment.sig>