Merge commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 May 2015 09:38:26 +0000 (11:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 May 2015 09:38:37 +0000 (11:38 +0200)
* commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53':
  rtmpdh: Add fate test for the DH handshake routine

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/Makefile
libavformat/rtmpdh.c

Simple merge
Simple merge