From: Michael Niedermayer Date: Mon, 24 Nov 2014 11:22:11 +0000 (+0100) Subject: Merge commit '065923b0781b06a2604f69f4e2c2407b7750a854' X-Git-Tag: n2.5~207 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=010adacbe2363a5f98d62db8fae7b0009552b801;hp=-c 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 --- 010adacbe2363a5f98d62db8fae7b0009552b801