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)
* commit 'd4aef997809167832ecc64e89dda8cb445e5fe10':
  rtmp: Follow Flash player numbering for channels.

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

Simple merge
Simple merge