[FFmpeg-cvslog] Merge commit '065923b0781b06a2604f69f4e2c2407b7750a854'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 24 12:22:11 2014 +0100| [010adacbe2363a5f98d62db8fae7b0009552b801] | committer: Michael Niedermayer

Merge commit '065923b0781b06a2604f69f4e2c2407b7750a854'

* commit '065923b0781b06a2604f69f4e2c2407b7750a854':
  mpegenc: prevent a NULL pointer dereference

Not merged, this is not needed, and could hide more serious issues

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

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