Merge commit '302ca6b20ed01ac584f5b15d5bca3d3a92b7a77a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 20:35:21 +0000 (21:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 20:36:20 +0000 (21:36 +0100)
* commit '302ca6b20ed01ac584f5b15d5bca3d3a92b7a77a':
  mpegvideo_enc: initialize the encoding context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/mpegvideo_enc.c

Simple merge