Michael Niedermayer 9336a980bb 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>

2013-01-01 14:04:50 +01:00

87 KiB

Raw Blame History

View Raw