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 /libavutil | |
| 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>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/Makefile | 1 | ||||
| -rw-r--r-- | libavutil/libavutil.v | 2 | ||||
| -rw-r--r-- | libavutil/sqrt_tab.c | 1 |
3 files changed, 1 insertions, 3 deletions
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" |