[FFmpeg-cvslog] Merge commit '468ea9d5b14f92fe61f47f034e67066f65163f5f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 23 13:34:42 2012 +0200| [a65bc2712db20207dc1065ba3e3e6fa341145d99] | committer: Michael Niedermayer

Merge commit '468ea9d5b14f92fe61f47f034e67066f65163f5f'

* commit '468ea9d5b14f92fe61f47f034e67066f65163f5f':
  Revert "avutil: make some tables visible again"
  Revert "avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility"

Conflicts:
	libavcodec/sqrt_tab.c
	libavutil/libavutil.v

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

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