comparison configure @ 27790:555dac8a7cff

cosmetics: Reorder some FFmpeg-related config.h and config.mak entries.
author diego
date Sat, 25 Oct 2008 01:43:24 +0000
parents b33d80671293
children 0f7e7c21548e
comparison
equal deleted inserted replaced
27789:b33d80671293 27790:555dac8a7cff
7980 LIBPREF=lib 7980 LIBPREF=lib
7981 LIBSUF=.a 7981 LIBSUF=.a
7982 LIBNAME=\$(LIBPREF)\$(NAME)\$(LIBSUF) 7982 LIBNAME=\$(LIBPREF)\$(NAME)\$(LIBSUF)
7983 7983
7984 CONFIG_ENCODERS=yes 7984 CONFIG_ENCODERS=yes
7985 # Some FFmpeg codecs depend on this. Enable it unconditionally for now.
7986 CONFIG_FFT=yes
7985 CONFIG_GPL=yes 7987 CONFIG_GPL=yes
7986 CONFIG_MUXERS=$_mencoder
7987 CONFIG_LIBAMR=$_libamr 7988 CONFIG_LIBAMR=$_libamr
7988 CONFIG_LIBAMR_NB=$_libamr_nb 7989 CONFIG_LIBAMR_NB=$_libamr_nb
7989 CONFIG_LIBAMR_WB=$_libamr_wb 7990 CONFIG_LIBAMR_WB=$_libamr_wb
7990 CONFIG_LIBDIRAC=$_libdirac_lavc 7991 CONFIG_LIBDIRAC=$_libdirac_lavc
7991 CONFIG_LIBFAAC=$_faac_lavc 7992 CONFIG_LIBFAAC=$_faac_lavc
7993 CONFIG_LIBSCHROEDINGER=$_libschroedinger_lavc 7994 CONFIG_LIBSCHROEDINGER=$_libschroedinger_lavc
7994 CONFIG_LIBVORBIS=$_libvorbis 7995 CONFIG_LIBVORBIS=$_libvorbis
7995 CONFIG_LIBX264=$_x264_lavc 7996 CONFIG_LIBX264=$_x264_lavc
7996 CONFIG_LIBXVID=$_xvid_lavc 7997 CONFIG_LIBXVID=$_xvid_lavc
7997 CONFIG_MLIB = $_mlib 7998 CONFIG_MLIB = $_mlib
7999 CONFIG_MUXERS=$_mencoder
7998 CONFIG_POSTPROC = yes 8000 CONFIG_POSTPROC = yes
7999 # Prevent building libavcodec/imgresample.c with conflicting symbols 8001 # Prevent building libavcodec/imgresample.c with conflicting symbols
8000 CONFIG_SWSCALE=yes 8002 CONFIG_SWSCALE=yes
8001 CONFIG_ZLIB=$_zlib 8003 CONFIG_ZLIB=$_zlib
8002 # Some FFmpeg codecs depend on this. Enable it unconditionally for now.
8003 CONFIG_FFT=yes
8004 8004
8005 HAVE_PTHREADS = $_pthreads 8005 HAVE_PTHREADS = $_pthreads
8006 HAVE_W32THREADS = $_w32threads 8006 HAVE_W32THREADS = $_w32threads
8007 8007
8008 `echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` 8008 `echo $_libavdecoders | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
8410 8410
8411 #define CONFIG_GPL 1 8411 #define CONFIG_GPL 1
8412 #define ENABLE_SMALL 0 8412 #define ENABLE_SMALL 0
8413 #define ENABLE_GRAY 0 8413 #define ENABLE_GRAY 0
8414 8414
8415 #define CONFIG_DECODERS 1
8416 #define ENABLE_DECODERS 1
8417 #define CONFIG_ENCODERS 1
8418 #define ENABLE_ENCODERS 1
8419
8420 #define CONFIG_DEMUXERS 1
8421 #define ENABLE_DEMUXERS 1
8422
8423 /* Some FFmpeg codecs depend on this. Enable it unconditionally for now. */ 8415 /* Some FFmpeg codecs depend on this. Enable it unconditionally for now. */
8424 #define CONFIG_FFT 1 8416 #define CONFIG_FFT 1
8425 #define ENABLE_FFT 1 8417 #define ENABLE_FFT 1
8426
8427 $_def_muxers
8428 8418
8429 /* Use these registers in FFmpeg x86 inline asm. No proper detection yet. */ 8419 /* Use these registers in FFmpeg x86 inline asm. No proper detection yet. */
8430 #define HAVE_EBX_AVAILABLE 1 8420 #define HAVE_EBX_AVAILABLE 1
8431 #ifndef MP_DEBUG 8421 #ifndef MP_DEBUG
8432 #define HAVE_EBP_AVAILABLE 1 8422 #define HAVE_EBP_AVAILABLE 1
8433 #endif 8423 #endif
8424
8425 #define CONFIG_DECODERS 1
8426 #define ENABLE_DECODERS 1
8427 #define CONFIG_ENCODERS 1
8428 #define ENABLE_ENCODERS 1
8429
8430 #define CONFIG_DEMUXERS 1
8431 #define ENABLE_DEMUXERS 1
8432
8433 $_def_muxers
8434 8434
8435 /* External libraries used through libavcodec. */ 8435 /* External libraries used through libavcodec. */
8436 $_def_faac_lavc 8436 $_def_faac_lavc
8437 $_def_libamr 8437 $_def_libamr
8438 $_def_libamr_nb 8438 $_def_libamr_nb