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)
commite7dd0365f293231d8fffa828bd170695e695fe18
tree928af06866f15381fe74c7f5040f411efb9f9312
parentf7fee8f700c27273fd0398d89c00ff7725bbf3fa
parenta5e6080a8d85122ba67bf6e5d1592b82a0397b5b
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Pass the parameters to do_adobe_auth in the right order

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