[FFmpeg-cvslog] Merge commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 18 03:12:10 2014 +0200| [7891b4fa590b3d21da028e56bf2c1eee1fe8260f] | committer: Michael Niedermayer

Merge commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0'

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

Conflicts:
	libavformat/version.h

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

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