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)
* commit '78efc69e7c990226f4b913721ef1b308ca5bfa04':
  rtmpdh: Make sure ret is initialized in the nettle version of bn_hex2bn

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

Simple merge