Merge commit '78efc69e7c990226f4b913721ef1b308ca5bfa04'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 29 May 2015 09:21:26 +0000 (11:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 29 May 2015 09:21:35 +0000 (11:21 +0200)
commit392832fc3ab1b506b750ec8a1bcc83e1396bc7c9
treea80ce21a711d5aee79f11032c24d5c5bca5d36d9
parentc7bd6a54af1b5bf290deff928aab7897ce6b99a8
parent78efc69e7c990226f4b913721ef1b308ca5bfa04
Merge commit '78efc69e7c990226f4b913721ef1b308ca5bfa04'

* commit '78efc69e7c990226f4b913721ef1b308ca5bfa04':
  rtmpdh: Make sure ret is initialized in the nettle version of bn_hex2bn

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