Commit 12e98210 authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 64b3aaf8 c0085f94
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment