Merge commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 May 2015 09:31:55 +0000 (11:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 May 2015 09:32:07 +0000 (11:32 +0200)
commitfbeb3fa999e8712af35f1d898ca0b0cbab707556
treeee9113b8c848d4ac68e4d8e873116dd285891272
parentbeecbe13a2ea49280554a7178bebc525e538b4e7
parent0508faaa11bf7507ffdd655aee57c9dc5a8203f4
Merge commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4'

* commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4':
  rtmpdh: Pass the actual buffer size of the output secret key

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtmpcrypt.c
libavformat/rtmpdh.c
libavformat/rtmpdh.h