diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-07-11 16:36:21 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-07-11 16:36:21 +0000 |
| commit | cf849000b52d55f01ca4906afde0a85cd45c8bc8 (patch) | |
| tree | 2ab3e71d01a31c5cd35d74b57383c8853918715b | |
| parent | 32bb30e644897a2a25f2c8586670a6c980aec30d (diff) | |
| download | xine-lib-cf849000b52d55f01ca4906afde0a85cd45c8bc8.tar.gz xine-lib-cf849000b52d55f01ca4906afde0a85cd45c8bc8.tar.bz2 | |
moving all libavcodec defines over to $(LIBFFMPEG_CFLAGS) and making sure,
this variable is used where necessary should fix MPEG encoding
CVS patchset: 5141
CVS date: 2003/07/11 16:36:21
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libffmpeg/libavcodec/alpha/Makefile.am | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 823d3ff92..e345e9948 100644 --- a/configure.ac +++ b/configure.ac @@ -219,7 +219,7 @@ AC_SUBST(LIBFFMPEG_CFLAGS) LIBMPEG2_CFLAGS="" LIBA52_CFLAGS="" -LIBFFMPEG_CFLAGS="-DSIMPLE_IDCT -DHAVE_AV_CONFIG_H -DRUNTIME_CPUDETECT -DUSE_FASTMEMCPY" +LIBFFMPEG_CFLAGS="-DSIMPLE_IDCT -DHAVE_AV_CONFIG_H -DRUNTIME_CPUDETECT -DUSE_FASTMEMCPY -DCONFIG_RISKY -DCONFIG_ENCODERS" AC_ARG_ENABLE(altivec, [ --disable-altivec use assembly codes for Motorola 74xx CPUs], @@ -278,7 +278,7 @@ dnl --------------------------------------------- dnl tvmode support using nvtv dnl --------------------------------------------- -AC_ARG_ENABLE(nvtv, [ --enable-nvtv use nvtv for output fullscreen to TV [default=yes]], enable_nvtv="$enableval", enable_nvtv=no) +AC_ARG_ENABLE(nvtv, [ --enable-nvtv use nvtv for output fullscreen to TV], enable_nvtv="$enableval", enable_nvtv=no) AC_MSG_CHECKING(for nvtv support) diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am index 17307c0c2..8722d2d0a 100644 --- a/src/libffmpeg/libavcodec/Makefile.am +++ b/src/libffmpeg/libavcodec/Makefile.am @@ -10,7 +10,7 @@ EXTRA_DIST = fdctref.c motion_est_template.c svq3.c wmv2.c \ ppc/mpegvideo_ppc.c ppc/dsputil_altivec.h ppc/idct_altivec.c \ imgresample.c motion_est.c -AM_CFLAGS = $(LIBFFMPEG_CFLAGS) -DCONFIG_RISKY -DCONFIG_ENCODERS +AM_CFLAGS = $(LIBFFMPEG_CFLAGS) ASFLAGS = noinst_LTLIBRARIES = libavcodec.la diff --git a/src/libffmpeg/libavcodec/alpha/Makefile.am b/src/libffmpeg/libavcodec/alpha/Makefile.am index 90fbf4c23..b7bb5f7ca 100644 --- a/src/libffmpeg/libavcodec/alpha/Makefile.am +++ b/src/libffmpeg/libavcodec/alpha/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/misc/Makefile.common +AM_CFLAGS = $(LIBFFMPEG_CFLAGS) + EXTRA_DIST = asm.h \ dsputil_alpha.c \ mpegvideo_alpha.c \ |