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)
commita9f7972844b70c8e94520f52080884bb1507171f
tree3aeb76548ed23bee55da5a5903a0103093434cdb
parente059ac59efb8001494870af5c6ac72d900846b0b
parent1b04eb20f7e3f0a71f73ba91efcc3d60a435e443
Merge commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443'

* commit '1b04eb20f7e3f0a71f73ba91efcc3d60a435e443':
  lavc: do not allocate edges in the default get_buffer2()

Conflicts:
libavcodec/utils.c

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