[FFmpeg-cvslog] Merge commit 'c0085f94fea89b180e5727b193484a83586d3490'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 16 10:55:32 2013 +0200| [12e9821042b77e2f631d944365c0a09111fd41d1] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12e9821042b77e2f631d944365c0a09111fd41d1
---