Merge commit '67e285ceca1cb602a5ab87010b30d904527924fe'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Sep 2013 07:31:29 +0000 (09:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Sep 2013 07:36:58 +0000 (09:36 +0200)
* commit '67e285ceca1cb602a5ab87010b30d904527924fe':
  mem: Handle av_reallocp(..., 0) properly

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

diff --cc libavutil/mem.c
Simple merge