* commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443': lavc: do not allocate edges in the default get_buffer2() Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>