RepoMirrors/ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-01 20:42:19 +00:00

Remove avconv

Browse Source 
All features have been merged into ffmpeg.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-01-24 21:55:47 +01:00
parent 1285baaab5
commit def678956a
4 changed files with 1 additions and 5737 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -11,7 +11,6 @@ vpath %.texi $(SRC_PATH)
vpath %/fate_config.sh.template $(SRC_PATH) vpath %/fate_config.sh.template $(SRC_PATH)
PROGS-$(CONFIG_FFMPEG) += ffmpeg PROGS-$(CONFIG_FFMPEG) += ffmpeg
PROGS-$(CONFIG_AVCONV) += avconv
PROGS-$(CONFIG_FFPLAY) += ffplay PROGS-$(CONFIG_FFPLAY) += ffplay
PROGS-$(CONFIG_FFPROBE) += ffprobe PROGS-$(CONFIG_FFPROBE) += ffprobe
PROGS-$(CONFIG_FFSERVER) += ffserver PROGS-$(CONFIG_FFSERVER) += ffserver
@ -24,7 +23,7 @@ HOSTPROGS := $(TESTTOOLS:%=tests/%)
TOOLS = qt-faststart trasher TOOLS = qt-faststart trasher
TOOLS-$(CONFIG_ZLIB) += cws2fws TOOLS-$(CONFIG_ZLIB) += cws2fws
BASENAMES = ffmpeg avconv ffplay ffprobe ffserver BASENAMES = ffmpeg ffplay ffprobe ffserver
ALLPROGS = $(BASENAMES:%=%$(PROGSSUF)$(EXESUF)) ALLPROGS = $(BASENAMES:%=%$(PROGSSUF)$(EXESUF))
ALLPROGS_G = $(BASENAMES:%=%$(PROGSSUF)_g$(EXESUF)) ALLPROGS_G = $(BASENAMES:%=%$(PROGSSUF)_g$(EXESUF))
ALLMANPAGES = $(BASENAMES:%=%.1) ALLMANPAGES = $(BASENAMES:%=%.1)

4669
avconv.c
View File

File diff suppressed because it is too large Load Diff

3
configure vendored
View File

@ -81,7 +81,6 @@ Configuration options:
and binaries will be unredistributable [no] and binaries will be unredistributable [no]
--disable-doc do not build documentation --disable-doc do not build documentation
--disable-ffmpeg disable ffmpeg build --disable-ffmpeg disable ffmpeg build
--enable-avconv enable avconv build
--disable-ffplay disable ffplay build --disable-ffplay disable ffplay build
--disable-ffprobe disable ffprobe build --disable-ffprobe disable ffprobe build
--disable-ffserver disable ffserver build --disable-ffserver disable ffserver build
@ -997,7 +996,6 @@ PROGRAM_LIST="
CONFIG_LIST=" CONFIG_LIST="
$COMPONENT_LIST $COMPONENT_LIST
$PROGRAM_LIST $PROGRAM_LIST
avconv
avplay avplay
avprobe avprobe
avserver avserver
@ -1673,7 +1671,6 @@ avformat_deps="avcodec"
postproc_deps="gpl" postproc_deps="gpl"
# programs # programs
avconv_deps="avcodec avformat swscale"
ffplay_deps="avcodec avformat swscale sdl" ffplay_deps="avcodec avformat swscale sdl"
ffplay_select="buffersink_filter rdft" ffplay_select="buffersink_filter rdft"
ffprobe_deps="avcodec avformat" ffprobe_deps="avcodec avformat"

1063
doc/avconv.texi
View File

File diff suppressed because it is too large Load Diff