Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jan 2013 13:04:50 +0000 (14:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jan 2013 13:04:50 +0000 (14:04 +0100)
commit9336a980bb2608089ad34cbf605fbb5ed9bca677
tree6f94f20b462758e9c43598cb8c100f381bfde4dc
parent8e4e532bb28ef8713145ec85aafac3b3fe2775e3
parentc1ea44c54d837a69d8285601cfba7aa8df16e053
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: Add support for limelight authentication
  rtmp: Add support for adobe authentication

Conflicts:
Changelog
libavformat/version.h

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