Merge commit '065923b0781b06a2604f69f4e2c2407b7750a854'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 11:22:11 +0000 (12:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 11:29:12 +0000 (12:29 +0100)
commit010adacbe2363a5f98d62db8fae7b0009552b801
treedc454e62fb5233745a40d3d8110d17aed4c72317
parentea41e6d6373063c3a2a9bf48ce8e1c2e6340b694
parent065923b0781b06a2604f69f4e2c2407b7750a854
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@gmx.at>