Merge commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 01:12:10 +0000 (03:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Oct 2014 01:12:10 +0000 (03:12 +0200)
commit7891b4fa590b3d21da028e56bf2c1eee1fe8260f
treec61c9203c6666be7e1375642028f19b34a305cd6
parent178764e833b14513ca4aaffa83f3d8444759a6ee
parent9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0
Merge commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0'

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

Conflicts:
libavformat/version.h

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