Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 11:03:44 +0000 (13:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 11:03:50 +0000 (13:03 +0200)
commit01b4689d2032994f3eac790f11e5d062b6f945db
tree601bd8474fecbc57f80daaec5bc9b242357810ee
parent208f9dd2ef06c5cfcb6ca494f35aba9149776e37
parentf8d1bb6723a677d7221c674a4e47e3d4cecfca17
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: rename main_channel_id to stream_id.

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