diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-03-25 18:51:57 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-03-25 18:51:57 +0000 |
| commit | 9d38fc06785322fce3de721e1d59f1792b0b8eaa (patch) | |
| tree | 68434f681e117e7a6b827d65dc2c98d408851230 /configure | |
| parent | af6fb3740ea89f724c1d3cf4e3fd22cf8850ffba (diff) | |
| download | mpv-9d38fc06785322fce3de721e1d59f1792b0b8eaa.tar.bz2 mpv-9d38fc06785322fce3de721e1d59f1792b0b8eaa.tar.xz | |
Move some FFmpeg-specific entries to the FFmpeg section of config.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30958 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -8446,10 +8446,8 @@ AS = $_cc CC = $_cc CXX = $_cc HOST_CC = $_host_cc -YASM = $_yasm INSTALL = $_install INSTALLSTRIP = $_install_strip -RANLIB = $_ranlib WINDRES = $_windres CFLAGS = $CFLAGS $extra_cflags @@ -8465,7 +8463,6 @@ CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = $cflags_no_omit_leaf_frame_pointer CFLAGS_STACKREALIGN = $cflags_stackrealign CFLAGS_SVGALIB_HELPER = $cflags_svgalib_helper CFLAGS_TREMOR_LOW = $cflags_tremor_low -YASMFLAGS = $YASMFLAGS EXTRALIBS = $extra_ldflags $_ld_static $_ld_lm $extra_libs EXTRALIBS_MPLAYER = $libs_mplayer @@ -8535,8 +8532,6 @@ FAAC=$_faac FAAD = $_faad FAAD_INTERNAL = $_faad_internal FASTMEMCPY = $_fastmemcpy -$mak_hardcoded_tables -$mak_libavcodec_mpegaudio_hp FBDEV = $_fbdev FREETYPE = $_freetype FTP = $_ftp @@ -8685,6 +8680,10 @@ HOSTCFLAGS=-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112 -O3 HOSTLIBS=-lm CC_O=-o \$@ LD=gcc +RANLIB = $_ranlib +YASM = $_yasm +YASMFLAGS = $YASMFLAGS + CONFIG_STATIC=yes SRC_PATH=.. BUILD_ROOT=.. @@ -8705,6 +8704,9 @@ CONFIG_LSP=yes CONFIG_MDCT=yes CONFIG_RDFT=yes +$mak_hardcoded_tables +$mak_libavcodec_mpegaudio_hp + CONFIG_BZLIB=$bzlib CONFIG_ENCODERS=yes CONFIG_GPL=yes |