Skip to content

Commit 6b35a83

Browse files
author
Rostislav Pehlivanov
committed
Remove the ffserver program
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
1 parent 2ca65fc commit 6b35a83

39 files changed

+44
-7340
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
/ffmpeg
3030
/ffplay
3131
/ffprobe
32-
/ffserver
3332
/config.asm
3433
/config.h
3534
/coverage.info

Changelog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ version <next>:
3535
- hilbert audio filter source
3636
- aiir audio filter
3737
- aiff: add support for CD-ROM XA ADPCM
38+
- Removed the ffserver program
3839

3940

4041
version 3.4:

MAINTAINERS

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ ffplay:
2929
ffprobe:
3030
ffprobe.c Stefano Sabatini
3131

32-
ffserver:
33-
ffserver.c Reynaldo H. Verdejo Pinochet
34-
3532
Commandline utility code:
3633
cmdutils.c, cmdutils.h Michael Niedermayer
3734

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ such as audio, video, subtitles and related metadata.
2121
* [ffplay](https://ffmpeg.org/ffplay.html) is a minimalistic multimedia player.
2222
* [ffprobe](https://ffmpeg.org/ffprobe.html) is a simple analysis tool to inspect
2323
multimedia content.
24-
* [ffserver](https://ffmpeg.org/ffserver.html) is a multimedia streaming server
25-
for live broadcasts.
2624
* Additional small tools such as `aviocat`, `ismindex` and `qt-faststart`.
2725

2826
## Documentation

configure

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ Program options:
116116
--disable-ffmpeg disable ffmpeg build
117117
--disable-ffplay disable ffplay build
118118
--disable-ffprobe disable ffprobe build
119-
--disable-ffserver disable ffserver build
120119
121120
Documentation options:
122121
--disable-doc do not build documentation
@@ -1722,7 +1721,6 @@ LICENSE_LIST="
17221721
PROGRAM_LIST="
17231722
ffplay
17241723
ffprobe
1725-
ffserver
17261724
ffmpeg
17271725
"
17281726

@@ -3358,8 +3356,6 @@ ffplay_select="rdft crop_filter transpose_filter hflip_filter vflip_filter rotat
33583356
ffplay_suggest="shell32"
33593357
ffprobe_deps="avcodec avformat"
33603358
ffprobe_suggest="shell32"
3361-
ffserver_deps="avformat fork sarestart"
3362-
ffserver_select="ffm_muxer rtp_protocol rtsp_demuxer"
33633359

33643360
# documentation
33653361
podpages_deps="perl"

doc/ffmpeg-bitstream-filters.texi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ bitstream level modifications without performing decoding.
2626
@chapter See Also
2727

2828
@ifhtml
29-
@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver},
29+
@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe},
3030
@url{libavcodec.html,libavcodec}
3131
@end ifhtml
3232

3333
@ifnothtml
34-
ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), libavcodec(3)
34+
ffmpeg(1), ffplay(1), ffprobe(1), libavcodec(3)
3535
@end ifnothtml
3636

3737
@include authors.texi

doc/ffmpeg-codecs.texi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ the libavcodec library.
2323
@chapter See Also
2424

2525
@ifhtml
26-
@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver},
26+
@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe},
2727
@url{libavcodec.html,libavcodec}
2828
@end ifhtml
2929

3030
@ifnothtml
31-
ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), libavcodec(3)
31+
ffmpeg(1), ffplay(1), ffprobe(1), libavcodec(3)
3232
@end ifnothtml
3333

3434
@include authors.texi

doc/ffmpeg-devices.texi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ libavdevice library.
2323
@chapter See Also
2424

2525
@ifhtml
26-
@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver},
26+
@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe},
2727
@url{libavdevice.html,libavdevice}
2828
@end ifhtml
2929

3030
@ifnothtml
31-
ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), libavdevice(3)
31+
ffmpeg(1), ffplay(1), ffprobe(1), libavdevice(3)
3232
@end ifnothtml
3333

3434
@include authors.texi

doc/ffmpeg-filters.texi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ libavfilter library.
2323
@chapter See Also
2424

2525
@ifhtml
26-
@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver},
26+
@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe},
2727
@url{libavfilter.html,libavfilter}
2828
@end ifhtml
2929

3030
@ifnothtml
31-
ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), libavfilter(3)
31+
ffmpeg(1), ffplay(1), ffprobe(1), libavfilter(3)
3232
@end ifnothtml
3333

3434
@include authors.texi

doc/ffmpeg-formats.texi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ provided by the libavformat library.
2323
@chapter See Also
2424

2525
@ifhtml
26-
@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver},
26+
@url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe},
2727
@url{libavformat.html,libavformat}
2828
@end ifhtml
2929

3030
@ifnothtml
31-
ffmpeg(1), ffplay(1), ffprobe(1), ffserver(1), libavformat(3)
31+
ffmpeg(1), ffplay(1), ffprobe(1), libavformat(3)
3232
@end ifnothtml
3333

3434
@include authors.texi

0 commit comments

Comments
 (0)