Merge commit '127d813bcb5705202b7100cf1eccd1e26d72ba14'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 May 2015 09:31:22 +0000 (11:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 May 2015 09:31:26 +0000 (11:31 +0200)
commit4c0b30b07a81727561cafc171a1d0182a5975a48
tree5d9d847a1e8cbe2fb08a84d6555750d468e8bfad
parent392832fc3ab1b506b750ec8a1bcc83e1396bc7c9
parent127d813bcb5705202b7100cf1eccd1e26d72ba14
Merge commit '127d813bcb5705202b7100cf1eccd1e26d72ba14'

* commit '127d813bcb5705202b7100cf1eccd1e26d72ba14':
  rtmpdh: Fix a local variable name in the nettle/gcrypt codepath

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