Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Sep 2013 09:56:56 +0000 (11:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Sep 2013 09:57:02 +0000 (11:57 +0200)
* qatar/master:
  mem: Document the non-compatibility of av_realloc() and av_malloc()

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

diff --cc libavutil/mem.h
Simple merge