[MPlayer-dev-eng] patch to use mencoder without divx4 libs

[Arpi]

Hi,

thank you, i've fixed configure based on your patch!

> i hear mplayer 0.60 is going to be released in a few days if all goes
> well...hopefully this can make it in before the release. the patch
> eliminates the divx4 dependency from mencoder. most of the work was
> already done; i just made a few changes to the configure process. of
> course, mencoder won't be terribly useful without at least one of
> divx4 OR libavcodec, so it might be desirable to put an either-or
> dependency in configure, but it should at least compile fine without
> either and work with raw or straight copying of the video. let me know
> if anything in the patch is bad and i can change it; this is my first
> time contributing to mplayer.
> 
> richard
> 
> 
> 
> ? nodivx4.diff
> Index: configure
> ===================================================================
> RCS file: /cvsroot/mplayer/main/configure,v
> retrieving revision 1.348
> diff -u -r1.348 configure
> --- configure	30 Dec 2001 04:03:27 -0000	1.348
> +++ configure	30 Dec 2001 07:38:39 -0000
> @@ -2408,7 +2408,7 @@
>    _codecmodules="opendivx $_codecmodules"
>  fi
>  
> -# mencoder requires those libs: libmp3lame and divx4linux encore
> +# mencoder requires libmp3lame and can use divx4linux encore
>  if test "$_mencoder" != no ; then
>    _mencoder=no
>  
> @@ -2443,7 +2443,7 @@
>    fi
>    echores "$_divx4linux_encore"
>  
> -  test "$_mp3lame" = yes && test "$_divx4linux_encore" = yes && _mencoder=yes
> +  test "$_mp3lame" = yes && _mencoder=yes
>  fi
>  
>  
> Index: mencoder.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/mencoder.c,v
> retrieving revision 1.53
> diff -u -r1.53 mencoder.c
> --- mencoder.c	26 Dec 2001 13:32:00 -0000	1.53
> +++ mencoder.c	30 Dec 2001 07:38:39 -0000
> @@ -1,4 +1,3 @@
> -#define HAVE_DIVX4ENCORE /* FIXME!! add it to configure */
>  
>  #define VCODEC_COPY 0
>  #define VCODEC_FRAMENO 1
> @@ -19,6 +18,10 @@
>  #include "mp_msg.h"
>  #include "version.h"
>  #include "help_mp.h"
> +
> +#ifdef NEW_ENCORE
> +#define HAVE_DIVX4ENCORE
> +#endif
>  
>  static char* banner_text=
>  "\n\n"
> 
> 


A'rpi / Astral & ESP-team

--
mailto:arpi at thot.banki.hu
http://esp-team.scene.hu