Merge commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094'
[ffmpeg.git] / libavformat / rtmpdh.h
2012-07-23 Michael NiedermayerMerge remote-tracking branch 'qatar/master'
2012-07-23 Samuel PitoisetRTMPE protocol support