Merge commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 18:56:23 +0000 (20:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 26 Jun 2014 18:56:23 +0000 (20:56 +0200)
* commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443':
  lavc: do not allocate edges in the default get_buffer2()

Conflicts:
libavcodec/utils.c

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

Simple merge