summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-12 13:03:40 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-12 13:03:40 +0000
commit49c22997d33b786258869088e6d98bee3b2ace78 (patch)
tree61eb4b1b8e63a6cc540183049708293b60728f2a /configure
parentd4c89faa494384155878110ec312be372ff24ae3 (diff)
downloadmpv-49c22997d33b786258869088e6d98bee3b2ace78.tar.bz2
mpv-49c22997d33b786258869088e6d98bee3b2ace78.tar.xz
Remove remnants of old libmp1e support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19026 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure30
1 files changed, 0 insertions, 30 deletions
diff --git a/configure b/configure
index 80f486b4b4..5f54aac80f 100755
--- a/configure
+++ b/configure
@@ -1572,7 +1572,6 @@ _libavformat_so=auto
_libpostproc=auto
_libpostproc_so=auto
_libfame=auto
-_mp1e=no
_mencoder=yes
_x11=auto
_dga=auto # 1 2 no auto
@@ -1792,8 +1791,6 @@ for ac_option do
--disable-langinfo) _langinfo=no ;;
--enable-rtc) _rtc=yes ;;
--disable-rtc) _rtc=no ;;
- --enable-mp1e) _mp1e=yes ;;
- --disable-mp1e) _mp1e=no ;;
--enable-libdv) _libdv=yes ;;
--disable-libdv) _libdv=no ;;
--enable-ossaudio) _ossaudio=yes ;;
@@ -4701,31 +4698,9 @@ if test "$_dxr3" = yes ; then
else
_def_dxr3='#undef HAVE_DXR3'
_novomodules="dxr3 $_novomodules"
- if test "$_mp1e" = auto ; then
- # we don't need mp1e
- _mp1e=no
- fi
fi
echores "$_dxr3"
-echocheck "libmp1e"
-if test "$_mmx" = no ; then
- # mp1e REQUIRES mmx!
- _mp1e=no
-fi
-if test "$_mp1e" != no ; then
- _mp1e=yes
- _def_mp1e='#define USE_MP1E'
- _ld_mp1e='libmp1e/libmp1e.a'
- _dep_mp1e='libmp1e/libmp1e.a'
-else
- _mp1e=no
- _def_mp1e='#undef USE_MP1E'
- _ld_mp1e=""
- _dep_mp1e=''
-fi
-echores "$_mp1e"
-
echocheck "libfame"
if test "$_libfame" = auto ; then
@@ -7581,8 +7556,6 @@ ZORAN = $_zr
FAME = $_libfame
FAME_LIB = $_ld_libfame
LIBDV = $_libdv
-MP1E_DEP = $_dep_mp1e
-MP1E_LIB = $_ld_mp1e
ARCH_LIB = $_ld_arch $_ld_iconv
XVID = $_xvid
XVID4 = $_xvid4
@@ -7806,9 +7779,6 @@ $_def_mp3lame
$_def_mp3lame_preset
$_def_mp3lame_preset_medium
-/* Define libmp1e for realtime mpeg encoding (for DXR3 and DVB cards) */
-$_def_mp1e
-
/* Define this to enable avg. byte/sec-based AVI sync method by default:
(use -bps or -nobps commandline option for run-time method selection)
-bps gives better sync for vbr mp3 audio, it is now default */