Merge commit 'd4aef997809167832ecc64e89dda8cb445e5fe10'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 10:57:15 +0000 (12:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 10:57:19 +0000 (12:57 +0200)
commit208f9dd2ef06c5cfcb6ca494f35aba9149776e37
tree9bf67568f77314924d36df43ed471324ea4e73a5
parentc71541d42a599e2273bb4e6069435093783d6dd2
parentd4aef997809167832ecc64e89dda8cb445e5fe10
Merge commit 'd4aef997809167832ecc64e89dda8cb445e5fe10'

* commit 'd4aef997809167832ecc64e89dda8cb445e5fe10':
  rtmp: Follow Flash player numbering for channels.

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