* commit '9bec3ca2':
  rtmpproto: Add pause support

Conflicts:
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>