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 /doc/APIchanges | |
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 'doc/APIchanges')
-rw-r--r-- | doc/APIchanges | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 33f1a1b777..9df0582e88 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -16,6 +16,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2013-06-05 - fc962d4 - lavu 52.13.0 - mem.h + Add av_realloc_array and av_reallocp_array + 2013-05-24 - xxxxxxx - lavfi 3.70.100 - avfilter.h Add support for slice multithreading to lavfi. Filters supporting threading are marked with AVFILTER_FLAG_SLICE_THREADS. |