Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Mar 2013 11:03:49 +0000 (12:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Mar 2013 11:03:53 +0000 (12:03 +0100)
* qatar/master:
  rtmp: Pass the parameters to do_adobe_auth in the right order

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

Simple merge