Merge commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 18:51:15 +0000 (20:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 18:51:15 +0000 (20:51 +0200)
commitbd879652476b1d57628f09531038ef4487fd68a6
tree984a0b25c7d7e8c1606f3129b4fc78924ed271da
parentd123d9abef52931f54701e5fb0ed569416258f75
parentd63443b9684fa7b3e086634f7b44b203b6d9221e
Merge commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e'

* commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e':
  lavc: drop the av_fast_{re,m}alloc compatibility wrappers

Conflicts:
libavcodec/utils.c

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