Merge commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 09:05:19 +0000 (11:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 09:06:26 +0000 (11:06 +0200)
commitc74c3fb1420b847056d88b040a451c3c56286357
treee73a6d8c9bf60323eb3ff38072b1cb9bfff24b96
parentede42109e73a0f836bca1a241369a5108003b91a
parent3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7
Merge commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7'

* commit '3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7':
  mem: Introduce av_reallocp

Conflicts:
doc/APIchanges
libavutil/mem.c
libavutil/mem.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavutil/mem.c
libavutil/mem.h
libavutil/version.h