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)
* commit '97d35fa89f73468d64f663bfc0686aa6cddd8b6a':
  rtmp: Factor out publish specific code

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

Simple merge