summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorgpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-06-12 21:24:43 +0000
committergpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-06-12 21:24:43 +0000
commit9e47e2b8249a64621a6a62c2f549c9ddb59df7f8 (patch)
treee9ac26fbe276ad1f77eb49cbf5650dca286cc7ab /configure
parent747dac29a998a98f011ff9d52784cfbcc611ff9c (diff)
downloadmpv-9e47e2b8249a64621a6a62c2f549c9ddb59df7f8.tar.bz2
mpv-9e47e2b8249a64621a6a62c2f549c9ddb59df7f8.tar.xz
add x264 encoding over lavc, Patch by our Dear Guru (Michael Niedermayer) ;)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18690 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 4 insertions, 0 deletions
diff --git a/configure b/configure
index 6d48c3f9a8..6ed8619d56 100755
--- a/configure
+++ b/configure
@@ -6543,11 +6543,13 @@ fi
if test "$_x264" = yes ; then
_x264=yes
_def_x264='#define HAVE_X264 1'
+ _def_lavc_x264='#define CONFIG_X264 1'
_codecmodules="x264 $_codecmodules"
else
_x264=no
_ld_x264=''
_def_x264='#undef HAVE_X264'
+ _def_lavc_x264='#undef CONFIG_X264'
_nocodecmodules="x264 $_nocodecmodules"
fi
echores "$_x264"
@@ -7548,6 +7550,7 @@ AMR_WB=$_amr_wb
`echo $_libavcodecs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
CONFIG_FAAC=$_faac
CONFIG_XVID=$_lavc_xvid
+CONFIG_X264=$_x264
CONFIG_GPL=yes
CONFIG_MUXERS=yes
@@ -7922,6 +7925,7 @@ $_def_amr_wb
$_def_lavc_faac
$_def_lavc_xvid
$_def_lavc_mp3lame
+$_def_lavc_x264
/* Use codec libs included in mplayer CVS / source dist: */
$_def_mp3lib