Commit 6c87ecef authored by diego's avatar diego

Remove obsolete and non-functional support for external LZO.

patch by Ville Skyttä, scop at users dot sourceforge dot net


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@5625 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent a2f8a632
...@@ -85,7 +85,6 @@ show_help(){ ...@@ -85,7 +85,6 @@ show_help(){
echo " --disable-dv1394 disable DV1394 grabbing [default=no]" echo " --disable-dv1394 disable DV1394 grabbing [default=no]"
echo " --disable-network disable network support [default=no]" echo " --disable-network disable network support [default=no]"
echo " --disable-zlib disable zlib [default=no]" echo " --disable-zlib disable zlib [default=no]"
echo " --disable-lzo disable lzo [default=no]"
echo " --disable-simple_idct disable simple IDCT routines [default=no]" echo " --disable-simple_idct disable simple IDCT routines [default=no]"
echo " --disable-vhook disable video hooking support" echo " --disable-vhook disable video hooking support"
echo " --enable-gprof enable profiling with gprof [$gprof]" echo " --enable-gprof enable profiling with gprof [$gprof]"
...@@ -395,7 +394,6 @@ dv1394="yes" ...@@ -395,7 +394,6 @@ dv1394="yes"
dc1394="no" dc1394="no"
network="yes" network="yes"
zlib="yes" zlib="yes"
lzo="yes"
libgsm="no" libgsm="no"
mp3lame="no" mp3lame="no"
libogg="no" libogg="no"
...@@ -723,8 +721,6 @@ for opt do ...@@ -723,8 +721,6 @@ for opt do
;; ;;
--disable-zlib) zlib="no" --disable-zlib) zlib="no"
;; ;;
--disable-lzo) lzo="no"
;;
--enable-a52) a52="yes" --enable-a52) a52="yes"
;; ;;
--enable-a52bin) a52bin="yes" --enable-a52bin) a52bin="yes"
...@@ -1212,7 +1208,6 @@ fi ...@@ -1212,7 +1208,6 @@ fi
check_func localtime_r && localtime_r=yes || localtime_r=no check_func localtime_r && localtime_r=yes || localtime_r=no
enabled zlib && check_lib zlib.h zlibVersion -lz || zlib="no" enabled zlib && check_lib zlib.h zlibVersion -lz || zlib="no"
enabled lzo && enabled gpl && check_lib lzo1x.h lzo_version -llzo || lzo="no"
# check for some common methods of building with pthread support # check for some common methods of building with pthread support
# do this before the optional library checks as some of them require pthreads # do this before the optional library checks as some of them require pthreads
...@@ -1482,7 +1477,6 @@ if test $cpu = "powerpc"; then ...@@ -1482,7 +1477,6 @@ if test $cpu = "powerpc"; then
fi fi
echo "gprof enabled $gprof" echo "gprof enabled $gprof"
echo "zlib enabled $zlib" echo "zlib enabled $zlib"
echo "lzo enabled $lzo"
echo "libgsm enabled $libgsm" echo "libgsm enabled $libgsm"
echo "mp3lame enabled $mp3lame" echo "mp3lame enabled $mp3lame"
echo "libogg enabled $libogg" echo "libogg enabled $libogg"
...@@ -1842,11 +1836,6 @@ if test "$zlib" = "yes" ; then ...@@ -1842,11 +1836,6 @@ if test "$zlib" = "yes" ; then
echo "CONFIG_ZLIB=yes" >> config.mak echo "CONFIG_ZLIB=yes" >> config.mak
fi fi
if test "$lzo" = "yes" ; then
echo "#define CONFIG_LZO 1" >> $TMPH
echo "CONFIG_LZO=yes" >> config.mak
fi
if test "$libgsm" = "yes" ; then if test "$libgsm" = "yes" ; then
echo "#define CONFIG_LIBGSM 1" >> $TMPH echo "#define CONFIG_LIBGSM 1" >> $TMPH
echo "CONFIG_LIBGSM=yes" >> config.mak echo "CONFIG_LIBGSM=yes" >> config.mak
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment