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)
commitc71541d42a599e2273bb4e6069435093783d6dd2
treef4e762eeac8b34d712cb176a00f7cb4291d8ca04
parent3f760214b44bff702f3701a0b13627b3c7153f6f
parent120af23cd5fcfc539d9575d17d403247ab17109b
Merge commit '120af23cd5fcfc539d9575d17d403247ab17109b'

* commit '120af23cd5fcfc539d9575d17d403247ab17109b':
  rtmp: Send video on a separate channel.

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