[FFmpeg-cvslog] Merge commit '894682a9739eb8d4bfc024b0d4e5757fcfe47378'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 18 17:11:17 2014 +0200| [daa7bccad2279d43e7173dba0174c2052a65a51f] | committer: Michael Niedermayer

Merge commit '894682a9739eb8d4bfc024b0d4e5757fcfe47378'

* 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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=daa7bccad2279d43e7173dba0174c2052a65a51f
---