Merge commit 'ffb7669e47343ac0caa866361965fdb2bf6ed825'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 09:22:51 +0000 (11:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 09:22:54 +0000 (11:22 +0200)
commit953a4191b8122d404bcd7db13e686c3caa66ab08
treecea67847eb7fc8e3ead5607fc3c7435a4059d568
parent0483cfe8ca94601fafdb724fed2e5ec824b2a115
parentffb7669e47343ac0caa866361965fdb2bf6ed825
Merge commit 'ffb7669e47343ac0caa866361965fdb2bf6ed825'

* commit 'ffb7669e47343ac0caa866361965fdb2bf6ed825':
  rtmp: Support play method in listen mode

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