Merge commit 'cce99f72d1b49d3dfee859136eeff3db32553750' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:13:32 +0000 (02:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:13:54 +0000 (02:13 +0100)
* commit 'cce99f72d1b49d3dfee859136eeff3db32553750':
  mpegenc: prevent a NULL pointer dereference

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

Trivial merge