Merge commit '024db24912a39316b0ef0b7d793307d62da038f4'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Jan 2014 16:09:30 +0000 (17:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Jan 2014 16:09:35 +0000 (17:09 +0100)
* commit '024db24912a39316b0ef0b7d793307d62da038f4':
  mpegvideo: allocate edges when encoding.

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

Simple merge