It has not been properly maintained for years and there is little hope
of that changing in the future.
It appears simpler to write a new replacement from scratch than
unbreaking it.
---
.gitignore | 1 -
Changelog | 1 +
Makefile | 3 +-
avserver.c | 4685 ----------------------------------------------
configure | 9 +-
doc/avserver.conf | 372 ----
doc/avserver.texi | 276 ---
doc/general.texi | 1 -
libavformat/Makefile | 2 -
libavformat/allformats.c | 1 -
libavformat/ffm.h | 59 -
libavformat/ffmdec.c | 483 -----
libavformat/ffmenc.c | 249 ---
tests/fate/avformat.mak | 1 -
tests/fate/seek.mak | 2 -
tests/lavf-regression.sh | 4 -
tests/ref/lavf/ffm | 3 -
tests/ref/seek/lavf-ffm | 53 -
18 files changed, 7 insertions(+), 6198 deletions(-)
delete mode 100644 avserver.c
delete mode 100644 doc/avserver.conf
delete mode 100644 doc/avserver.texi
delete mode 100644 libavformat/ffm.h
delete mode 100644 libavformat/ffmdec.c
delete mode 100644 libavformat/ffmenc.c
delete mode 100644 tests/ref/lavf/ffm
delete mode 100644 tests/ref/seek/lavf-ffm
diff --git a/.gitignore b/.gitignore
index 07ba485..9ca8f4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,6 @@
/avconv
/avplay
/avprobe
-/avserver
/config.*
/coverage.info
/version.h
diff --git a/Changelog b/Changelog
index f157f7d..bfdd8d1 100644
--- a/Changelog
+++ b/Changelog
@@ -27,6 +27,7 @@ version <next>:
- libbs2b-based stereo-to-binaural audio filter
- native Opus decoder
- display matrix export and rotation api
+- drop avserver, it was unmaintained for years and largely broken
version 10:
diff --git a/Makefile b/Makefile
index 71c068c..6302997 100644
--- a/Makefile
+++ b/Makefile
@@ -63,12 +63,11 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC)
AVPROGS-$(CONFIG_AVCONV) += avconv
AVPROGS-$(CONFIG_AVPLAY) += avplay
AVPROGS-$(CONFIG_AVPROBE) += avprobe
-AVPROGS-$(CONFIG_AVSERVER) += avserver
AVPROGS := $(AVPROGS-yes:%=%$(EXESUF))
PROGS += $(AVPROGS)
-AVBASENAMES = avconv avplay avprobe avserver
+AVBASENAMES = avconv avplay avprobe
ALLAVPROGS = $(AVBASENAMES:%=%$(EXESUF))
$(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog) += cmdutils.o))
diff --git a/avserver.c b/avserver.c
deleted file mode 100644
index 56bcda9..0000000
diff --git a/configure b/configure
index 59f7273..7c76b40 100755
--- a/configure
+++ b/configure
@@ -108,7 +108,7 @@ Program options:
--disable-avconv disable avconv build
--disable-avplay disable avplay build
--disable-avprobe disable avprobe build
- --disable-avserver disable avserver build
+ --disable-avserver deprecated, does nothing
Component options:
--disable-doc do not build documentation
@@ -2142,8 +2142,6 @@ avplay_deps="avcodec avformat avresample swscale sdl"
avplay_libs='$sdl_libs'
avplay_select="rdft"
avprobe_deps="avcodec avformat"
-avserver_deps="avformat fork !shared"
-avserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
# documentation
pod2man_deps="doc"
@@ -3532,7 +3530,6 @@ case $target_os in
add_compat strtod.o strtod=avpriv_strtod
network_extralibs='-lbsd'
exeobjs=compat/plan9/main.o
- disable avserver
cp_f='cp'
;;
none)
@@ -4406,6 +4403,10 @@ enabled scale_filter && prepend avfilter_deps
"swscale"
enabled opus_decoder && prepend avcodec_deps "avresample"
+disabled avserver &&
+ warn "avserver has been removed, the --disable-avserver option is"\
+ "only provided for compatibility and will be removed in the future"
+
expand_deps(){
lib_deps=${1}_deps
eval "deps=\$$lib_deps"
diff --git a/doc/avserver.conf b/doc/avserver.conf
deleted file mode 100644
index e1cd9fb..0000000
diff --git a/doc/avserver.texi b/doc/avserver.texi
deleted file mode 100644
index 88e6221..0000000
diff --git a/doc/general.texi b/doc/general.texi
index 3b79796..1fd5f36 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -235,7 +235,6 @@ library:
@item Electronic Arts cdata @tab @tab X
@item Electronic Arts Multimedia @tab @tab X
@tab Used in various EA games; files have extensions like WVE and UV2.
-@item FFM (AVserver live feed) @tab X @tab X
@item Flash (SWF) @tab X @tab X
@item Flash 9 (AVM2) @tab X @tab X
@tab Only embedded audio is decoded.
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 59fe34e..dc4f9e7 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -106,8 +106,6 @@ OBJS-$(CONFIG_EA_CDATA_DEMUXER) += eacdata.o
OBJS-$(CONFIG_EA_DEMUXER) += electronicarts.o
OBJS-$(CONFIG_EAC3_DEMUXER) += ac3dec.o rawdec.o
OBJS-$(CONFIG_EAC3_MUXER) += rawenc.o
-OBJS-$(CONFIG_FFM_DEMUXER) += ffmdec.o
-OBJS-$(CONFIG_FFM_MUXER) += ffmenc.o
OBJS-$(CONFIG_FFMETADATA_DEMUXER) += ffmetadec.o
OBJS-$(CONFIG_FFMETADATA_MUXER) += ffmetaenc.o
OBJS-$(CONFIG_FILMSTRIP_DEMUXER) += filmstripdec.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 40962f8..8083ef3 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -100,7 +100,6 @@ void av_register_all(void)
REGISTER_DEMUXER (EA_CDATA, ea_cdata);
REGISTER_MUXDEMUX(EAC3, eac3);
REGISTER_MUXER (F4V, f4v);
- REGISTER_MUXDEMUX(FFM, ffm);
REGISTER_MUXDEMUX(FFMETADATA, ffmetadata);
REGISTER_MUXDEMUX(FILMSTRIP, filmstrip);
REGISTER_MUXDEMUX(FLAC, flac);
diff --git a/libavformat/ffm.h b/libavformat/ffm.h
deleted file mode 100644
index 70c3e88..0000000
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
deleted file mode 100644
index acc1dc4..0000000
diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c
deleted file mode 100644
index 91658e1..0000000
diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak
index 7ef68ad..458ae7c 100644
--- a/tests/fate/avformat.mak
+++ b/tests/fate/avformat.mak
@@ -6,7 +6,6 @@ FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, AVI)
+= avi
FATE_LAVF-$(call ENCDEC, BMP, IMAGE2) += bmp
FATE_LAVF-$(call ENCDEC, DPX, IMAGE2) += dpx
FATE_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv_fmt
-FATE_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2, FFM) += ffm
FATE_LAVF-$(call ENCDEC, FLV, FLV) += flv_fmt
FATE_LAVF-$(call ENCDEC, GIF, IMAGE2) += gif
FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf
diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak
index a423711..be06f0f 100644
--- a/tests/fate/seek.mak
+++ b/tests/fate/seek.mak
@@ -151,7 +151,6 @@ FATE_SEEK_LAVF-$(call ENCDEC, PCM_S16BE, AU)
+= au
FATE_SEEK_LAVF-$(call ENCDEC2, MPEG4, MP2, AVI) += avi
FATE_SEEK_LAVF-$(call ENCDEC, BMP, IMAGE2) += bmp
FATE_SEEK_LAVF-$(call ENCDEC2, DVVIDEO, PCM_S16LE, AVI) += dv_fmt
-FATE_SEEK_LAVF-$(call ENCDEC2, MPEG1VIDEO, MP2, FFM) += ffm
FATE_SEEK_LAVF-$(call ENCDEC, FLV, FLV) += flv_fmt
FATE_SEEK_LAVF-$(call ENCDEC, GIF, IMAGE2) += gif
FATE_SEEK_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, GXF) += gxf
@@ -188,7 +187,6 @@ fate-seek-lavf-au: SRC = lavf/lavf.au
fate-seek-lavf-avi: SRC = lavf/lavf.avi
fate-seek-lavf-bmp: SRC = images/bmp/%02d.bmp
fate-seek-lavf-dv_fmt: SRC = lavf/lavf.dv
-fate-seek-lavf-ffm: SRC = lavf/lavf.ffm
fate-seek-lavf-flv_fmt: SRC = lavf/lavf.flv
fate-seek-lavf-gif: SRC = lavf/lavf.gif
fate-seek-lavf-gxf: SRC = lavf/lavf.gxf
diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh
index e2edee2..3c18b2f 100755
--- a/tests/lavf-regression.sh
+++ b/tests/lavf-regression.sh
@@ -78,10 +78,6 @@ if [ -n "$do_swf" ] ; then
do_lavf swf "" "-an"
fi
-if [ -n "$do_ffm" ] ; then
-do_lavf ffm "" "-ar 44100"
-fi
-
if [ -n "$do_flv_fmt" ] ; then
do_lavf flv "" "-an"
fi
diff --git a/tests/ref/lavf/ffm b/tests/ref/lavf/ffm
deleted file mode 100644
index 7518a81..0000000
diff --git a/tests/ref/seek/lavf-ffm b/tests/ref/seek/lavf-ffm
deleted file mode 100644
index 2597220..0000000
--
1.7.10.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
