Merge commit '4d11e4b47db6387077682595d53e9a17b50511cb' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:25:08 +0000 (02:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:25:08 +0000 (02:25 +0100)
* commit '4d11e4b47db6387077682595d53e9a17b50511cb':
  libtwolame: prevent a NULL pointer dereference

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

Trivial merge