[FFmpeg-devel] [PATCH] Remove the ffserver program and the ffm muxer/demuxer

James Almer jamrial at gmail.com
Thu Oct 27 16:58:55 EEST 2016


On 10/26/2016 7:43 PM, Rostislav Pehlivanov wrote:
> From 48d1ed653e7841f49f50559510ca06f524cbbf1f Mon Sep 17 00:00:00 2001
> From: Rostislav Pehlivanov <atomnuker at gmail.com>
> Date: Wed, 26 Oct 2016 23:38:46 +0100
> Subject: [PATCH] Remove the ffserver program
> 
> Also changes the mpjpeg boundary tag to "ffmpeg" (it's arbitrary).

This is unrelated, so IMO should be in a separate patch.

> 
> Signed-off-by: Rostislav Pehlivanov <atomnuker at gmail.com>
> ---
>  .gitignore                        |    1 -
>  Changelog                         |    1 +
>  MAINTAINERS                       |    3 -
>  Makefile                          |    4 +-
>  README.md                         |    2 -
>  configure                         |    5 -
>  doc/ffmpeg-bitstream-filters.texi |    4 +-
>  doc/ffmpeg-codecs.texi            |    4 +-
>  doc/ffmpeg-devices.texi           |    4 +-
>  doc/ffmpeg-filters.texi           |    4 +-
>  doc/ffmpeg-formats.texi           |    4 +-
>  doc/ffmpeg-protocols.texi         |    4 +-
>  doc/ffmpeg-resampler.texi         |    4 +-
>  doc/ffmpeg-scaler.texi            |    4 +-
>  doc/ffmpeg-utils.texi             |    4 +-
>  doc/ffmpeg.texi                   |    4 +-
>  doc/ffplay.texi                   |    4 +-
>  doc/ffprobe.texi                  |    4 +-
>  doc/ffserver.conf                 |  372 ----
>  doc/ffserver.texi                 |  923 ---------
>  doc/issue_tracker.txt             |    3 -
>  doc/libavcodec.texi               |    4 +-
>  doc/libavdevice.texi              |    4 +-
>  doc/libavfilter.texi              |    4 +-
>  doc/libavformat.texi              |    4 +-
>  doc/libavutil.texi                |    4 +-
>  doc/libswresample.texi            |    4 +-
>  doc/libswscale.texi               |    4 +-
>  doc/protocols.texi                |    2 +-
>  ffserver.c                        | 4043 -------------------------------------
>  ffserver_config.c                 | 1320 ------------
>  ffserver_config.h                 |  134 --
>  libavformat/mpjpeg.c              |    2 +-
>  tests/Makefile                    |   10 -
>  tests/ffserver-regression.sh      |   39 -
>  tests/ffserver.conf               |  311 ---
>  tools/bisect-create               |    2 +-
>  37 files changed, 43 insertions(+), 7210 deletions(-)
>  delete mode 100644 doc/ffserver.conf
>  delete mode 100644 doc/ffserver.texi
>  delete mode 100644 ffserver.c
>  delete mode 100644 ffserver_config.c
>  delete mode 100644 ffserver_config.h
>  delete mode 100755 tests/ffserver-regression.sh
>  delete mode 100644 tests/ffserver.conf

"make ffserver" fails as unknown target as expected, "make all" and
other targets i could think about like testprogs and examples still
work, and fate passes.

LGTM, but ask Michael before backporting to 3.2 since he's making
the release and this is a big change.



More information about the ffmpeg-devel mailing list