[FFmpeg-cvslog] Merge commit '127d813bcb5705202b7100cf1eccd1e26d72ba14'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 29 11:31:22 2015 +0200| [4c0b30b07a81727561cafc171a1d0182a5975a48] | committer: Michael Niedermayer

Merge commit '127d813bcb5705202b7100cf1eccd1e26d72ba14'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c0b30b07a81727561cafc171a1d0182a5975a48
---