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)
commitd83707c64197de354419faa1816f6ec3e7baf7ba
tree46f949d4817dffce78d78ae702eeeb4d9a5c33ea
parentd08dd3286369964cd0476ddaa037a1193e9adcde
parent024db24912a39316b0ef0b7d793307d62da038f4
Merge commit '024db24912a39316b0ef0b7d793307d62da038f4'

* commit '024db24912a39316b0ef0b7d793307d62da038f4':
  mpegvideo: allocate edges when encoding.

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