diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 10:55:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-16 10:56:22 +0200 |
| commit | 12e9821042b77e2f631d944365c0a09111fd41d1 (patch) | |
| tree | d1885d55bb0dedcefaccb0600f02a65eba6e24b0 /libavcodec | |
| parent | 64b3aaf8f6c260ebf3bb301c65b5043aa29a69eb (diff) | |
| parent | c0085f94fea89b180e5727b193484a83586d3490 (diff) | |
| download | ffmpeg-12e9821042b77e2f631d944365c0a09111fd41d1.tar.gz | |
Merge commit 'c0085f94fea89b180e5727b193484a83586d3490'
* commit 'c0085f94fea89b180e5727b193484a83586d3490':
mpegaudio_tablegen: Don't use llrint
cos_tablegen: Don't use lrint
tablegen: Don't use cbrtf in host tools
tableprint: Fix use of a size_t print with MSVC
Conflicts:
libavcodec/cbrt_tablegen.h
libavcodec/mpegaudio_tablegen.h
See: e51692114354b8e460bf5c9f6def7089a6b969c0
See: 50867209930fd03c05b879bd6223b52c7305c90a
See: 008014b5e72442fe7c8bf4a31e6bb74469b81359
See: 00aa24ffee91d52488765088ea0f60748e2a2083
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions