Commit 0fec2cb1 authored by Anton Khirnov's avatar Anton Khirnov

Remove ffmpeg.

parent 9292fe4a
......@@ -11,7 +11,6 @@ doc/*.1
doc/*.html
doc/*.pod
doxy
ffmpeg
avconv
avplay
avprobe
......
......@@ -52,7 +52,6 @@ COMPILE_S = $(call COMPILE,AS)
%.c %.h: TAG = GEN
PROGS-$(CONFIG_FFMPEG) += ffmpeg
PROGS-$(CONFIG_AVCONV) += avconv
PROGS-$(CONFIG_AVPLAY) += avplay
PROGS-$(CONFIG_AVPROBE) += avprobe
......@@ -65,7 +64,7 @@ HOSTPROGS := $(TESTTOOLS:%=tests/%)
TOOLS = qt-faststart trasher
TOOLS-$(CONFIG_ZLIB) += cws2fws
BASENAMES = ffmpeg avconv avplay avprobe avserver
BASENAMES = avconv avplay avprobe avserver
ALLPROGS = $(BASENAMES:%=%$(EXESUF))
ALLMANPAGES = $(BASENAMES:%=%.1)
......
......@@ -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"
......
This diff is collapsed.
This diff is collapsed.
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