diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 11:05:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 11:06:26 +0200 |
| commit | c74c3fb1420b847056d88b040a451c3c56286357 (patch) | |
| tree | e73a6d8c9bf60323eb3ff38072b1cb9bfff24b96 /doc | |
| parent | ede42109e73a0f836bca1a241369a5108003b91a (diff) | |
| parent | 3feb3d6ce4be0a09a9f8f13d613bed25b523b6e7 (diff) | |
| download | ffmpeg-c74c3fb1420b847056d88b040a451c3c56286357.tar.gz | |
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>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/APIchanges | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 4dcf7bff64..3db4a9e0cd 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2013-09-xx - xxxxxxx - lavu 52.13.0 - mem.h + Add av_reallocp. + 2013-09-04 - 3e1f507 - lavc 55.31.101 - avcodec.h avcodec_close() argument can be NULL. |