Merge commit '97d35fa89f73468d64f663bfc0686aa6cddd8b6a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 09:17:07 +0000 (11:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 09:17:11 +0000 (11:17 +0200)
commit0483cfe8ca94601fafdb724fed2e5ec824b2a115
tree837ce3ff3a49b154ae5dea52d223dc092a390c66
parentc74c3fb1420b847056d88b040a451c3c56286357
parent97d35fa89f73468d64f663bfc0686aa6cddd8b6a
Merge commit '97d35fa89f73468d64f663bfc0686aa6cddd8b6a'

* commit '97d35fa89f73468d64f663bfc0686aa6cddd8b6a':
  rtmp: Factor out publish specific code

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