diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-05 11:19:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-05 11:19:16 +0200 |
| commit | 30b491f1c99aa7992157791a98d6cdae6ca2e895 (patch) | |
| tree | 816c548897f653bb339ff22848c4b6bb5858b4ea /libavcodec/sipr16kdata.h | |
| parent | ea038b996d5662702b2247a6aa919dee1cebc0be (diff) | |
| parent | 3b4feac1ec14f861bdd7f494f288f4d8dd7f449e (diff) | |
| download | ffmpeg-30b491f1c99aa7992157791a98d6cdae6ca2e895.tar.gz | |
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>
Diffstat (limited to 'libavcodec/sipr16kdata.h')
0 files changed, 0 insertions, 0 deletions