[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec zmbv.c, NONE, 1.1 Makefile, 1.240, 1.241 avcodec.h, 1.450, 1.451 allcodecs.c, 1.128, 1.129

[Alexander Strasser]

Diego Biurrun wrote:
> On Sun, Feb 12, 2006 at 09:49:37AM -0800, Mike Melanson wrote:
> > Alexander Strasser wrote:
> > >  Is the zmbv decoder considedered to work in some cases without zlib?
> > >If not we should somehow deactivate it in configure and remove the
> > >#ifdefs from zmbv.c .
> > 
> > 	I don't think it will work without zlib but I am still documenting 
> > it. If you know an elegant way to disable ZMBV in the build system, that 
> > would be useful.
> 
> As seen in libavcodec/Makefile:
> 
> ifneq ($(CONFIG_MSZH_DECODER)$(CONFIG_ZLIB_DECODER)$(CONFIG_ZLIB_ENCODER),)
>     OBJS+= lcl.o
> endif
> 
> I believe that should do the trick...

  No, that is `if none of the 3 codecs in the file is activated, don't
compile it'.

  I don't know if we have a `if libxyz is not available don't compile
it' in source at this time. But i would propose to implement it like
the attached patch (or similar, only tested on my machine so far).

  Alex (beastd)
-------------- next part --------------
Index: configure
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
retrieving revision 1.248
diff -u -r1.248 configure
--- configure	11 Feb 2006 20:37:12 -0000	1.248
+++ configure	12 Feb 2006 18:53:59 -0000
@@ -3,6 +3,12 @@
 # ffmpeg configure script (c) 2000, 2001, 2002 Fabrice Bellard
 #
 
+# codec list manipulation
+codec_list_remove()
+{
+  CODEC_LIST="`echo "$CODEC_LIST" | sed "s/$1//"`"
+}
+
 if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
 cat << EOF
 
@@ -1047,6 +1053,9 @@
 fi
 if test "$zlib" = "yes"; then
 extralibs="$extralibs -lz"
+else
+  # remove codecs that rely on ZLIB support
+  codec_list_remove zmbv_decoder  
 fi
 
 if test "$lzo" = "yes" -a "$gpl" = "yes"; then