[Mplayer-cvslog] CVS: main/libmpcodecs ve_lavc.c,1.5,1.6

[Felix Buenemann]

On Monday 15 April 2002 01:16, Arpi of Ize wrote:
> Update of /cvsroot/mplayer/main/libmpcodecs
> In directory mplayer:/var/tmp.root/cvs-serv11988
>
> Modified Files:
> 	ve_lavc.c
> Log Message:
> workaround Juanjo's stupid vme change
>
> Index: ve_lavc.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -r1.5 -r1.6
> --- ve_lavc.c	13 Apr 2002 19:14:31 -0000	1.5
> +++ ve_lavc.c	14 Apr 2002 23:16:55 -0000	1.6
> @@ -123,10 +123,12 @@
>
>      lavc_venc_context.flags|= lavc_param_v4mv ? CODEC_FLAG_4MV : 0;
>
> -    /* motion estimation (0 = none ... 3 = high quality but slow) */
> -    /* this is just an extern from libavcodec but it should be in the
> -       encoder context - FIXME */
> +#ifdef ME_ZERO
> +    // workaround Juanjo's stupid incompatible change:
>      motion_estimation_method = lavc_param_vme;
> +#else
> +    lavc_venc_context.me_method = ME_ZERO+lavc_param_vme;
> +#endif
>
>      /* fixed qscale :p */
>      if (lavc_param_vqscale)
>
Ummm, isnt above code illogical, as we check fo ME_ZERO in #ifdef and then 
also use it in #else clause?
-- 
Best Regards,
        Atmos
____________________________________________
- MPlayer Developer - http://mplayerhq.hu/ -
____________________________________________