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