-
Michael Niedermayer authored
* qatar/master: rtmp: rename main_channel_id to stream_id. Merged-by: Michael Niedermayer <michaelni@gmx.at>
01b4689d
* qatar/master:
rtmp: rename main_channel_id to stream_id.
Merged-by: Michael Niedermayer <michaelni@gmx.at>