Merge commit '468ea9d5b14f92fe61f47f034e67066f65163f5f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Oct 2012 11:34:42 +0000 (13:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Oct 2012 11:34:42 +0000 (13:34 +0200)
commita65bc2712db20207dc1065ba3e3e6fa341145d99
tree37de357d463df7e920d47d53ea954e4916dfb5f4
parentc2a25e141e018c6f16b4a2ba3e33f3995bb1a25e
parent468ea9d5b14f92fe61f47f034e67066f65163f5f
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@gmx.at>
libavcodec/Makefile
libavcodec/mathtables.c
libavutil/Makefile
libavutil/libavutil.v