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)
* 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>
1  2 
libavcodec/Makefile
libavcodec/mathtables.c
libavutil/Makefile
libavutil/libavutil.v

Simple merge
Simple merge
@@@ -90,15 -84,11 +90,14 @@@ OBJS = adler32.
         rc4.o                                                            \
         samplefmt.o                                                      \
         sha.o                                                            \
-        sqrt_tab.o                                                       \
         time.o                                                           \
 +       timecode.o                                                       \
         tree.o                                                           \
         utils.o                                                          \
 +       xga_font_data.o                                                  \
         xtea.o                                                           \
  
 +
  OBJS += $(COMPAT_OBJS:%=../compat/%)
  
  SKIPHEADERS          = old_pix_fmts.h
@@@ -1,4 -1,4 +1,4 @@@
  LIBAVUTIL_$MAJOR {
-         global: av*; ff_*; ff_*_tab;
 -        global: av*;
++        global: av*; ff_*;
          local: *;
  };