diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-11-01 18:12:53 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-11-01 18:12:53 +0000 |
| commit | ad86ea038a0b4803c7e3f1a82a293e2ee538e345 (patch) | |
| tree | 24aa3f8a8900028189d268d75854049dfa386794 /configure.ac | |
| parent | 72ae3e51758986775949a7ba2002a526d359389f (diff) | |
| download | xine-lib-ad86ea038a0b4803c7e3f1a82a293e2ee538e345.tar.gz xine-lib-ad86ea038a0b4803c7e3f1a82a293e2ee538e345.tar.bz2 | |
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
CVS patchset: 5667
CVS date: 2003/11/01 18:12:53
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 302d07b64..67532e6b7 100644 --- a/configure.ac +++ b/configure.ac @@ -222,14 +222,14 @@ AC_SUBST(DYNAMIC_LD_LIBS) 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/armv4l/Makefile 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 |