[xine-cvs] CVS: xine-lib configure.ac,1.189,1.190

[Michael R. <mr...@us...>]

Update of /cvsroot/xine/xine-lib
In directory sc8-pr-cvs1:/tmp/cvs-serv24653

Modified Files:
	configure.ac 
Log Message:
big ffmpeg patch
* do not define CONFIG_ENCODERS any more, use a stripped down XINE_MPEG_ENCODER,
  which will only compile an I-frame-only MPEG1 encoder (speeds up compile time)
* fix a lot of warnings in ffmpeg (a good deal of which have already been
  submitted to the ffmpeg project by Mike)
* simplify some Makefiles


Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/xine-lib/configure.ac,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- configure.ac	30 Oct 2003 21:51:27 -0000	1.189
+++ configure.ac	1 Nov 2003 18:12:53 -0000	1.190
@@ -222,14 +222,14 @@
 
 
 dnl ---------------------------------------------
-dnl mpeg2lib stuff
+dnl mpeg2lib and ffmpeg stuff
 dnl ---------------------------------------------
 
 AC_SUBST(LIBMPEG2_CFLAGS)
 AC_SUBST(LIBFFMPEG_CFLAGS)
 
 LIBMPEG2_CFLAGS=""
-LIBFFMPEG_CFLAGS="-DSIMPLE_IDCT -DHAVE_AV_CONFIG_H -DRUNTIME_CPUDETECT -DUSE_FASTMEMCPY -DCONFIG_RISKY -DCONFIG_ENCODERS -DCONFIG_DECODERS"
+LIBFFMPEG_CFLAGS="-DSIMPLE_IDCT -DHAVE_AV_CONFIG_H -DRUNTIME_CPUDETECT -DUSE_FASTMEMCPY -DCONFIG_RISKY -DCONFIG_DECODERS -DXINE_MPEG_ENCODER"
 
 AC_CHECK_DECL(lrintf,[AC_DEFINE(HAVE_LRINTF,1,[Define this if the 'lrintf' function is declared in math.h])],,[
 #define _ISOC9X_SOURCE
@@ -1821,6 +1821,7 @@
 src/libffmpeg/libavcodec/i386/Makefile
 src/libffmpeg/libavcodec/mlib/Makefile
 src/libffmpeg/libavcodec/alpha/Makefile
+src/libffmpeg/libavcodec/ppc/Makefile
 src/libffmpeg/libavcodec/libpostproc/Makefile
 src/libflac/Makefile
 src/liblpcm/Makefile