diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 20:51:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 20:51:15 +0200 |
| commit | bd879652476b1d57628f09531038ef4487fd68a6 (patch) | |
| tree | 984a0b25c7d7e8c1606f3129b4fc78924ed271da /libavcodec/libwavpackenc.c | |
| parent | d123d9abef52931f54701e5fb0ed569416258f75 (diff) | |
| parent | d63443b9684fa7b3e086634f7b44b203b6d9221e (diff) | |
| download | ffmpeg-bd879652476b1d57628f09531038ef4487fd68a6.tar.gz | |
Merge commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e'
* commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e':
lavc: drop the av_fast_{re,m}alloc compatibility wrappers
Conflicts:
libavcodec/utils.c
See: a973e01501bc3ca5c61d778f97f350837d4ed481
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libwavpackenc.c')
0 files changed, 0 insertions, 0 deletions