Merge commit 'a42d5c861fea8d18d997c6ba3f4a1d8aa95a288b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Nov 2014 21:25:09 +0000 (22:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Nov 2014 21:26:15 +0000 (22:26 +0100)
commitad2424e6b2984b253769040a2f2d7fb1344098b8
tree4b59a03851ba1135f6e77dcb70ed79737b14c924
parentb9ffafbfcc0f8aaffc9de3919a1d295dbe6d53f7
parenta42d5c861fea8d18d997c6ba3f4a1d8aa95a288b
Merge commit 'a42d5c861fea8d18d997c6ba3f4a1d8aa95a288b'

* commit 'a42d5c861fea8d18d997c6ba3f4a1d8aa95a288b':
  libtwolame: prevent a NULL pointer dereference

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