Merge commit 'c0085f94'
* commit 'c0085f94': 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: e5169211 See: 50867209 See: 008014b5 See: 00aa24ffMerged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment