[FFmpeg-cvslog] Merge commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 21 13:29:03 2012 +0200| [dcbff35199e1596d9d1200e734ef4a4c306e50f1] | committer: Michael Niedermayer

Merge commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9'

* commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9':
  avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility
  avutil: make some tables visible again
  avutil: remove inline av_log2 from public API
  celp_math: rename ff_log2 to ff_log2_q15

Conflicts:
	libavutil/libavutil.v

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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