aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-01-12 11:12:15 +0100
committerAnton Khirnov <anton@khirnov.net>2012-01-23 21:04:29 +0100
commit0fec2cb15cc6ff1fcc724c774ec36abadcb7b6ad (patch)
treeee2e8b0c841b1e614f4b608fbb6ef9fc38cfc807 /configure
parent9292fe4a1db90c3705d7e6275f3ddb9728b2d363 (diff)
downloadandroid_external_ffmpeg-0fec2cb15cc6ff1fcc724c774ec36abadcb7b6ad.tar.gz
android_external_ffmpeg-0fec2cb15cc6ff1fcc724c774ec36abadcb7b6ad.tar.bz2
android_external_ffmpeg-0fec2cb15cc6ff1fcc724c774ec36abadcb7b6ad.zip
Remove ffmpeg.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 0 insertions, 3 deletions
diff --git a/configure b/configure
index ad7d9d4c5b..aff889457e 100755
--- a/configure
+++ b/configure
@@ -80,7 +80,6 @@ Configuration options:
--enable-nonfree allow use of nonfree code, the resulting libs
and binaries will be unredistributable [no]
--disable-doc do not build documentation
- --disable-ffmpeg disable ffmpeg build
--disable-avconv disable avconv build
--disable-avplay disable avplay build
--disable-avprobe disable avprobe build
@@ -911,7 +910,6 @@ PROGRAM_LIST="
avplay
avprobe
avserver
- ffmpeg
"
CONFIG_LIST="
@@ -1536,7 +1534,6 @@ avplay_select="rdft"
avprobe_deps="avcodec avformat"
avserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer !shared"
avserver_extralibs='$ldl'
-ffmpeg_deps="avcodec avformat swscale"
doc_deps="texi2html"