Changeset 12e98210 in ffmpeg

Timestamp:

Oct 16, 2013, 8:56:22 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3a8b52c0

Parents:

64b3aaf8 (diff), c0085f9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (10/16/13 08:55:32)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/16/13 08:56:22)

Message:

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>

(No files)