Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Jun 2013 09:19:16 +0000 (11:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Jun 2013 09:19:16 +0000 (11:19 +0200)
commit30b491f1c99aa7992157791a98d6cdae6ca2e895
tree816c548897f653bb339ff22848c4b6bb5858b4ea
parentea038b996d5662702b2247a6aa919dee1cebc0be
parent3b4feac1ec14f861bdd7f494f288f4d8dd7f449e
Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e'

* commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e':
  movenc: Keep track of the allocated size for the cluster array
  mem: Add av_realloc_array and av_reallocp_array

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

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