Merge commit '120af23cd5fcfc539d9575d17d403247ab17109b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 10:52:19 +0000 (12:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 10:52:25 +0000 (12:52 +0200)
* commit '120af23cd5fcfc539d9575d17d403247ab17109b':
  rtmp: Send video on a separate channel.

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

Simple merge