summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorJosh Varner <jlvarner@gmail.com>2005-02-21 17:50:48 +0000
committerMichael Niedermayer <michaelni@gmx.at>2005-02-21 17:50:48 +0000
commitfe533bb3a7400399a927a6347bc21a8d7b6015a3 (patch)
tree1373a55c0e46b1a513b16d97f0718c330360da40 /configure
parent09f20d37867baaa0122ffdd75f0481b2b3a08079 (diff)
removing --disable-risky patch by (Josh Varner <jlvarner gmail com>)
Originally committed as revision 3966 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 0 insertions, 10 deletions
diff --git a/configure b/configure
index e0766ffa1f..0e21d327ea 100755
--- a/configure
+++ b/configure
@@ -63,7 +63,6 @@ echo " --disable-mpegaudio-hp faster (but less accurate)"
echo " mpegaudio decoding [default=no]"
echo " --disable-ffserver disable ffserver build"
echo " --disable-ffplay disable ffplay build"
-echo " --disable-risky disables patent encumbered codecs"
echo " --enable-small optimize for size instead of speed"
echo " --enable-memalign-hack emulate memalign, interferes with memory debuggers"
echo " --disable-strip disable stripping of executables and shared libraries"
@@ -188,7 +187,6 @@ LIBSUF=".a"
SLIBPREF="lib"
SLIBSUF=".so"
EXESUF=""
-risky="yes"
amr_nb="no"
amr_wb="no"
amr_nb_fixed="no"
@@ -442,8 +440,6 @@ for opt do
;;
--disable-ffplay) ffplay="no"
;;
- --disable-risky) risky="no"
- ;;
--enable-small) optimize="small"
;;
--enable-amr_nb) amr_nb="yes"
@@ -1062,7 +1058,6 @@ echo "SDL support $sdl"
if test $sdl_too_old = "yes"; then
echo "-> Your SDL version is too old - please upgrade to have FFplay/SDL support"
fi
-echo "risky / patent encumbered codecs $risky"
if test "$vhook" = "yes" ; then
echo "Imlib2 support $imlib2"
@@ -1435,11 +1430,6 @@ if test "$ffplay" = "yes" ; then
echo "CONFIG_FFPLAY=yes" >> config.mak
fi
-if test "$risky" = "yes" ; then
- echo "#define CONFIG_RISKY 1" >> $TMPH
- echo "CONFIG_RISKY=yes" >> config.mak
-fi
-
if test "$gpl" = "yes" ; then
echo "#define CONFIG_GPL 1" >> $TMPH
echo "CONFIG_GPL=yes" >> config.mak