Merge commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Oct 2012 12:22:25 +0000 (14:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Oct 2012 12:24:58 +0000 (14:24 +0200)
commitd197bd4f5ee752c95ebaf7d94257ca5121309674
tree4944469aac7a57aa67e732ab1aa05f4a4eb81884
parent3b0bb321a50cd2591c6bd46059a66f6a53d9fc08
parent930c9d4373e0f3cb7c64fcfc129127a309f6d066
Merge commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066'

* commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066':
  avutil: Duplicate ff_log2_tab instead of sharing it across libs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavformat/Makefile
libavutil/Makefile
libavutil/log2_tab.c
libavutil/mathematics.c