Revert "test e2"

This reverts commit b50fe1effe8ac4b50d512910e3440c0b13f043db.

Conflicts:
	rules-archive
	rules-make
update rtmpdump