Earlier versions of for instance libavcodec expect this symbol to be
present in libavutil. It can be removed at the next major bump.
---
libavcodec/mathtables.c | 3 +++
libavutil/mathematics.c | 13 +++++++++++++
libavutil/version.h | 3 +++
3 files changed, 19 insertions(+)
No need to become aggressive nor offended. On my test system, the
problem of colliding symbol is masked by our symbol scripts, so I didn't
notice them in our tests. This revised patch takes out the definition of
ff_sqrt_tab from avcodec without breaking the binaries. Obviously, we
get a small performance hit in the shared library case, but considering
the circumstances, I think that this is acceptable in this case.
Note that I'm not particularily happy with the '#if 0' part, suggestions
are welcome. However, fixing the resulting linking failure on the next
avutil bump should be both easy to catch and fix.
diff --git a/libavcodec/mathtables.c b/libavcodec/mathtables.c
index 141aa78..b0ade8a 100644
--- a/libavcodec/mathtables.c
+++ b/libavcodec/mathtables.c
@@ -56,6 +56,8 @@ const uint32_t ff_inverse[257]={
16777216
};
+// enable as soon as this table gets removed from avutil
+#if 0
const uint8_t ff_sqrt_tab[256]={
0, 16, 23, 28, 32, 36, 40, 43, 46, 48, 51, 54, 56, 58, 60, 62, 64, 66, 68,
70, 72, 74, 76, 77, 79, 80, 82, 84, 85, 87, 88, 90,
91, 92, 94, 95, 96, 98,
99,100,102,103,104,105,107,108,109,110,111,112,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
@@ -66,6 +68,7 @@ const uint8_t ff_sqrt_tab[256]={
222,223,223,224,224,225,226,226,227,227,228,228,229,230,230,231,231,232,232,233,233,234,235,235,236,236,237,237,238,238,239,239,
240,240,241,242,242,243,243,244,244,245,245,246,246,247,247,248,248,249,249,250,250,251,251,252,252,253,253,254,254,255,255,255
};
+#endif
const uint8_t ff_reverse[256] = {
0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0,
diff --git a/libavutil/mathematics.c b/libavutil/mathematics.c
index 137683e..aac2561 100644
--- a/libavutil/mathematics.c
+++ b/libavutil/mathematics.c
@@ -30,6 +30,19 @@
#include "mathematics.h"
#include "version.h"
+#if FF_API_SQRT
+const uint8_t ff_sqrt_tab[256]={
+ 0, 16, 23, 28, 32, 36, 40, 43, 46, 48, 51, 54, 56, 58, 60, 62, 64, 66, 68,
70, 72, 74, 76, 77, 79, 80, 82, 84, 85, 87, 88, 90,
+ 91, 92, 94, 95, 96, 98,
99,100,102,103,104,105,107,108,109,110,111,112,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
+128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,144,145,146,147,148,149,150,151,151,152,153,154,155,156,156,
+157,158,159,160,160,161,162,163,164,164,165,166,167,168,168,169,170,171,171,172,173,174,174,175,176,176,177,178,179,179,180,181,
+182,182,183,184,184,185,186,186,187,188,188,189,190,190,191,192,192,193,194,194,195,196,196,197,198,198,199,200,200,201,202,202,
+203,204,204,205,205,206,207,207,208,208,209,210,210,211,212,212,213,213,214,215,215,216,216,217,218,218,219,219,220,220,221,222,
+222,223,223,224,224,225,226,226,227,227,228,228,229,230,230,231,231,232,232,233,233,234,235,235,236,236,237,237,238,238,239,239,
+240,240,241,242,242,243,243,244,244,245,245,246,246,247,247,248,248,249,249,250,250,251,251,252,252,253,253,254,254,255,255,255
+};
+#endif
+
#if FF_API_AV_REVERSE
const uint8_t av_reverse[256]={
0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0,
diff --git a/libavutil/version.h b/libavutil/version.h
index 4cc2f7c..b483043 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -85,6 +85,9 @@
#ifndef FF_API_AV_REVERSE
#define FF_API_AV_REVERSE (LIBAVUTIL_VERSION_MAJOR < 52)
#endif
+#ifndef FF_API_SQRT
+#define FF_API_SQRT (LIBAVUTIL_VERSION_MAJOR < 52)
+#endif
/**
* @}
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
