diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 15:04:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 15:04:04 +0100 |
| commit | 7c888ae746da0d9f6a11bab9758c01d641b49d7b (patch) | |
| tree | 22862c9f615cb2e636feec9ffd1d5e2a675295ed /doc | |
| parent | 2925571278bf09702564dfedd5e7731a112dd1f0 (diff) | |
| parent | cce3e0a49f0dd030262c28d9c53de0bd2fd909c4 (diff) | |
| download | ffmpeg-7c888ae746da0d9f6a11bab9758c01d641b49d7b.tar.gz | |
Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4'
* commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4':
Move av_fast_{m,re}alloc from lavc to lavu.
Conflicts:
libavcodec/avcodec.h
libavcodec/utils.c
libavutil/mem.c
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 c5668ca273..cb1c33ffa4 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2012-10-22 API changes, most recent first: +2013-11-xx - xxxxxxx - lavu 52.18.0 - mem.h + Move av_fast_malloc() and av_fast_realloc() for libavcodec to libavutil. + 2013-10-xx - xxxxxxx - lavc 55.27.0 - avcodec.h Deprecate AVCodecContext.error_rate, it is replaced by the 'error_rate' private option of the mpegvideo encoder family. |