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 /libavcodec/escape130.c | |
| 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 'libavcodec/escape130.c')
0 files changed, 0 insertions, 0 deletions