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 /libavformat/movenc.h | |
parent | ea038b996d5662702b2247a6aa919dee1cebc0be (diff) | |
parent | 3b4feac1ec14f861bdd7f494f288f4d8dd7f449e (diff) |
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 'libavformat/movenc.h')
-rw-r--r-- | libavformat/movenc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/movenc.h b/libavformat/movenc.h index 2c57834d10..6b583d5577 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -102,6 +102,7 @@ typedef struct MOVTrack { int vos_len; uint8_t *vos_data; MOVIentry *cluster; + unsigned cluster_capacity; int audio_vbr; int height; ///< active picture (w/o VBI) height for D-10/IMX uint32_t tref_tag; |