comparison configure @ 29390:80c32e67306c

The Makefile variable names for external libraries in FFmpeg changed. Adapt their names in config.mak, closes Bugzilla #1513.
author diego
date Sun, 19 Jul 2009 21:09:00 +0000
parents 91d8313a6d17
children e69a1d754130
comparison
equal deleted inserted replaced
29389:912e642ffb95 29390:80c32e67306c
8386 CONFIG_RDFT=yes 8386 CONFIG_RDFT=yes
8387 8387
8388 CONFIG_BZLIB=$bzlib 8388 CONFIG_BZLIB=$bzlib
8389 CONFIG_ENCODERS=yes 8389 CONFIG_ENCODERS=yes
8390 CONFIG_GPL=yes 8390 CONFIG_GPL=yes
8391 CONFIG_LIBDIRAC=$_libdirac_lavc 8391 CONFIG_LIBDIRAC_DECODER=$_libdirac_lavc
8392 CONFIG_LIBFAAC=$_faac_lavc 8392 CONFIG_LIBDIRAC_ENCODER=$_libdirac_lavc
8393 CONFIG_LIBMP3LAME=$_mp3lame_lavc 8393 CONFIG_LIBFAAC_ENCODER=$_faac_lavc
8394 CONFIG_LIBOPENCORE_AMRNB=$_libopencore_amrnb 8394 CONFIG_LIBMP3LAME_ENCODER=$_mp3lame_lavc
8395 CONFIG_LIBOPENCORE_AMRWB=$_libopencore_amrwb 8395 CONFIG_LIBOPENCORE_AMRNB_DECODER=$_libopencore_amrnb
8396 CONFIG_LIBSCHROEDINGER=$_libschroedinger_lavc 8396 CONFIG_LIBOPENCORE_AMRNB_ENCODER=$_libopencore_amrnb
8397 CONFIG_LIBVORBIS=$_libvorbis 8397 CONFIG_LIBOPENCORE_AMRWB_DECODER=$_libopencore_amrwb
8398 CONFIG_LIBX264=$_x264_lavc 8398 CONFIG_LIBSCHROEDINGER_DECODER=$_libschroedinger_lavc
8399 CONFIG_LIBXVID=$_xvid_lavc 8399 CONFIG_LIBSCHROEDINGER_ENCODER=$_libschroedinger_lavc
8400 CONFIG_LIBVORBIS_ENCODER=$_libvorbis
8401 CONFIG_LIBX264_ENCODER=$_x264_lavc
8402 CONFIG_LIBXVID_ENCODER=$_xvid_lavc
8400 CONFIG_MLIB = $_mlib 8403 CONFIG_MLIB = $_mlib
8401 CONFIG_MUXERS=$_mencoder 8404 CONFIG_MUXERS=$_mencoder
8402 CONFIG_POSTPROC = yes 8405 CONFIG_POSTPROC = yes
8403 # Prevent building libavcodec/imgresample.c with conflicting symbols 8406 # Prevent building libavcodec/imgresample.c with conflicting symbols
8404 CONFIG_SWSCALE=yes 8407 CONFIG_SWSCALE=yes