[FFmpeg-cvslog] Merge commit 'a42d5c861fea8d18d997c6ba3f4a1d8aa95a288b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 21 22:25:09 2014 +0100| [ad2424e6b2984b253769040a2f2d7fb1344098b8] | committer: Michael Niedermayer

Merge commit 'a42d5c861fea8d18d997c6ba3f4a1d8aa95a288b'

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

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

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