Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Oct 2013 06:13:12 +0000 (08:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Oct 2013 06:13:42 +0000 (08:13 +0200)
* qatar/master:
  mem: Make av_strdup allocate using av_realloc

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

diff --cc libavutil/mem.c
Simple merge