diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 03:20:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 03:20:49 +0200 |
| commit | 97d7c8d5848899797ce657f50a1f7aa49c2955cd (patch) | |
| tree | 948bd0533f8c92ec1423ce2b34a325d54f4b1e14 /libavutil/mem.c | |
| parent | 8d3a967635c321df4c0cc9e99988719b3349429b (diff) | |
| parent | 7b66cf5ce7fdb8b3fa13459aab3f4d6ab559f1ea (diff) | |
| download | ffmpeg-97d7c8d5848899797ce657f50a1f7aa49c2955cd.tar.gz | |
Merge commit '7b66cf5ce7fdb8b3fa13459aab3f4d6ab559f1ea' into release/2.4
* commit '7b66cf5ce7fdb8b3fa13459aab3f4d6ab559f1ea':
aacpsy: correct calculation of minath in psy_3gpp_init
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/mem.c')
0 files changed, 0 insertions, 0 deletions