summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-07-19 21:09:00 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-07-19 21:09:00 +0000
commitbcd7541f4e9d646a140aa9020d4daa64b7764d25 (patch)
tree9f0a18118b2b70bd0b1418640bfa5cdfc64b3821 /configure
parentb91c49e4b0adee6625314b0a0230b68856c56e07 (diff)
downloadmpv-bcd7541f4e9d646a140aa9020d4daa64b7764d25.tar.bz2
mpv-bcd7541f4e9d646a140aa9020d4daa64b7764d25.tar.xz
The Makefile variable names for external libraries in FFmpeg changed.
Adapt their names in config.mak, closes Bugzilla #1513. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29432 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure21
1 files changed, 12 insertions, 9 deletions
diff --git a/configure b/configure
index 06ea5d1f13..d225730e1e 100755
--- a/configure
+++ b/configure
@@ -8388,15 +8388,18 @@ CONFIG_RDFT=yes
CONFIG_BZLIB=$bzlib
CONFIG_ENCODERS=yes
CONFIG_GPL=yes
-CONFIG_LIBDIRAC=$_libdirac_lavc
-CONFIG_LIBFAAC=$_faac_lavc
-CONFIG_LIBMP3LAME=$_mp3lame_lavc
-CONFIG_LIBOPENCORE_AMRNB=$_libopencore_amrnb
-CONFIG_LIBOPENCORE_AMRWB=$_libopencore_amrwb
-CONFIG_LIBSCHROEDINGER=$_libschroedinger_lavc
-CONFIG_LIBVORBIS=$_libvorbis
-CONFIG_LIBX264=$_x264_lavc
-CONFIG_LIBXVID=$_xvid_lavc
+CONFIG_LIBDIRAC_DECODER=$_libdirac_lavc
+CONFIG_LIBDIRAC_ENCODER=$_libdirac_lavc
+CONFIG_LIBFAAC_ENCODER=$_faac_lavc
+CONFIG_LIBMP3LAME_ENCODER=$_mp3lame_lavc
+CONFIG_LIBOPENCORE_AMRNB_DECODER=$_libopencore_amrnb
+CONFIG_LIBOPENCORE_AMRNB_ENCODER=$_libopencore_amrnb
+CONFIG_LIBOPENCORE_AMRWB_DECODER=$_libopencore_amrwb
+CONFIG_LIBSCHROEDINGER_DECODER=$_libschroedinger_lavc
+CONFIG_LIBSCHROEDINGER_ENCODER=$_libschroedinger_lavc
+CONFIG_LIBVORBIS_ENCODER=$_libvorbis
+CONFIG_LIBX264_ENCODER=$_x264_lavc
+CONFIG_LIBXVID_ENCODER=$_xvid_lavc
CONFIG_MLIB = $_mlib
CONFIG_MUXERS=$_mencoder
CONFIG_POSTPROC = yes