diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-10-25 01:43:24 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-10-25 01:43:24 +0000 |
| commit | 15a80092161a1cd305f8005c780c744416a5252b (patch) | |
| tree | be78a77c60264048834d6bc9a6a0ffaae116cbfc /configure | |
| parent | ff6e6ec743922a77517502029de0d0f655af9711 (diff) | |
| download | mpv-15a80092161a1cd305f8005c780c744416a5252b.tar.bz2 mpv-15a80092161a1cd305f8005c780c744416a5252b.tar.xz | |
cosmetics: Reorder some FFmpeg-related config.h and config.mak entries.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27824 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -7982,8 +7982,9 @@ LIBSUF=.a LIBNAME=\$(LIBPREF)\$(NAME)\$(LIBSUF) CONFIG_ENCODERS=yes +# Some FFmpeg codecs depend on this. Enable it unconditionally for now. +CONFIG_FFT=yes CONFIG_GPL=yes -CONFIG_MUXERS=$_mencoder CONFIG_LIBAMR=$_libamr CONFIG_LIBAMR_NB=$_libamr_nb CONFIG_LIBAMR_WB=$_libamr_wb @@ -7995,12 +7996,11 @@ CONFIG_LIBVORBIS=$_libvorbis CONFIG_LIBX264=$_x264_lavc CONFIG_LIBXVID=$_xvid_lavc CONFIG_MLIB = $_mlib +CONFIG_MUXERS=$_mencoder CONFIG_POSTPROC = yes # Prevent building libavcodec/imgresample.c with conflicting symbols CONFIG_SWSCALE=yes CONFIG_ZLIB=$_zlib -# Some FFmpeg codecs depend on this. Enable it unconditionally for now. -CONFIG_FFT=yes HAVE_PTHREADS = $_pthreads HAVE_W32THREADS = $_w32threads @@ -8412,26 +8412,26 @@ $_def_threads #define ENABLE_SMALL 0 #define ENABLE_GRAY 0 -#define CONFIG_DECODERS 1 -#define ENABLE_DECODERS 1 -#define CONFIG_ENCODERS 1 -#define ENABLE_ENCODERS 1 - -#define CONFIG_DEMUXERS 1 -#define ENABLE_DEMUXERS 1 - /* Some FFmpeg codecs depend on this. Enable it unconditionally for now. */ #define CONFIG_FFT 1 #define ENABLE_FFT 1 -$_def_muxers - /* Use these registers in FFmpeg x86 inline asm. No proper detection yet. */ #define HAVE_EBX_AVAILABLE 1 #ifndef MP_DEBUG #define HAVE_EBP_AVAILABLE 1 #endif +#define CONFIG_DECODERS 1 +#define ENABLE_DECODERS 1 +#define CONFIG_ENCODERS 1 +#define ENABLE_ENCODERS 1 + +#define CONFIG_DEMUXERS 1 +#define ENABLE_DEMUXERS 1 + +$_def_muxers + /* External libraries used through libavcodec. */ $_def_faac_lavc $_def_libamr |