Merge commit '894682a9739eb8d4bfc024b0d4e5757fcfe47378'

Browse Source

* commit '894682a9739eb8d4bfc024b0d4e5757fcfe47378':
  Remove avserver.

Conflicts:
	.gitignore
	Changelog
	Makefile
	configure
	doc/ffserver.conf
	doc/ffserver.texi
	doc/general.texi
	ffserver.c
	libavformat/Makefile
	libavformat/ffm.h
	libavformat/ffmdec.c
	libavformat/ffmenc.c
	tests/fate/avformat.mak
	tests/lavf-regression.sh
	tests/ref/lavf/ffm
	tests/ref/seek/lavf-ffm

Not merged, ffserver does have a maintainer
co maintainers are welcome and needed though !

Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2014-06-18 17:11:17 +02:00

parent 5439959ef0 894682a973

commit daa7bccad2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available