diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 15:34:42 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 15:34:42 +0400 |
commit | a65bc2712db20207dc1065ba3e3e6fa341145d99 (patch) | |
tree | 37de357d463df7e920d47d53ea954e4916dfb5f4 | |
parent | c2a25e141e018c6f16b4a2ba3e33f3995bb1a25e (diff) | |
parent | 468ea9d5b14f92fe61f47f034e67066f65163f5f (diff) |
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>
-rw-r--r-- | libavcodec/Makefile | 1 | ||||
-rw-r--r-- | libavcodec/mathtables.c | 11 | ||||
-rw-r--r-- | libavcodec/sqrt_tab.c | 30 | ||||
-rw-r--r-- | libavutil/Makefile | 1 | ||||
-rw-r--r-- | libavutil/libavutil.v | 2 | ||||
-rw-r--r-- | libavutil/sqrt_tab.c | 1 |
6 files changed, 12 insertions, 34 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7653c06040..bb97e5df08 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -33,7 +33,6 @@ OBJS = allcodecs.o \ resample.o \ resample2.o \ simple_idct.o \ - sqrt_tab.o \ utils.o \ # parts needed for many different codecs diff --git a/libavcodec/mathtables.c b/libavcodec/mathtables.c index bbc49ced72..037b135a1b 100644 --- a/libavcodec/mathtables.c +++ b/libavcodec/mathtables.c @@ -58,6 +58,17 @@ const uint32_t ff_inverse[257]={ 16777216 }; +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 +}; + const uint8_t ff_reverse[256] = { 0x00,0x80,0x40,0xC0,0x20,0xA0,0x60,0xE0,0x10,0x90,0x50,0xD0,0x30,0xB0,0x70,0xF0, 0x08,0x88,0x48,0xC8,0x28,0xA8,0x68,0xE8,0x18,0x98,0x58,0xD8,0x38,0xB8,0x78,0xF8, diff --git a/libavcodec/sqrt_tab.c b/libavcodec/sqrt_tab.c deleted file mode 100644 index f084b45f90..0000000000 --- a/libavcodec/sqrt_tab.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <stdint.h> - -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 -}; diff --git a/libavutil/Makefile b/libavutil/Makefile index 63a48be744..3a6f7313ed 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -90,7 +90,6 @@ OBJS = adler32.o \ rc4.o \ samplefmt.o \ sha.o \ - sqrt_tab.o \ time.o \ timecode.o \ tree.o \ diff --git a/libavutil/libavutil.v b/libavutil/libavutil.v index 4c0631f6a7..eb16ae175e 100644 --- a/libavutil/libavutil.v +++ b/libavutil/libavutil.v @@ -1,4 +1,4 @@ LIBAVUTIL_$MAJOR { - global: av*; ff_*; ff_*_tab; + global: av*; ff_*; local: *; }; diff --git a/libavutil/sqrt_tab.c b/libavutil/sqrt_tab.c deleted file mode 100644 index e3d978b569..0000000000 --- a/libavutil/sqrt_tab.c +++ /dev/null @@ -1 +0,0 @@ -#include "libavcodec/sqrt_tab.c" |