Merge commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Oct 2012 11:29:03 +0000 (13:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Oct 2012 11:35:42 +0000 (13:35 +0200)
* commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9':
  avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility
  avutil: make some tables visible again
  avutil: remove inline av_log2 from public API
  celp_math: rename ff_log2 to ff_log2_q15

Conflicts:
libavutil/libavutil.v

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/Makefile
libavcodec/acelp_pitch_delay.c
libavcodec/celp_math.c
libavcodec/celp_math.h
libavcodec/mathtables.c
libavcodec/sqrt_tab.c
libavutil/Makefile
libavutil/common.h
libavutil/intmath.h
libavutil/libavutil.v
libavutil/log2.c

Simple merge
Simple merge
@@@ -72,10 -65,9 +72,10 @@@ static const uint16_t tab_log2[33] 
    10552,  11719,  12858,  13971,  15057,  16120,  17158,  18175,
    19170,  20145,  21100,  22036,  22954,  23854,  24738,  25605,
    26457,  27294,  28116,  28924,  29719,  30500,  31269,  32025,  32769,
 +#endif
  };
  
- int ff_log2(uint32_t value)
+ int ff_log2_q15(uint32_t value)
  {
      uint8_t  power_int;
      uint8_t  frac_x0;
Simple merge
Simple merge
index 0000000,3f18d91..f084b45
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,30 +1,30 @@@
 - * This file is part of Libav.
+ /*
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * 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.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * 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
+ };
@@@ -89,14 -84,12 +90,15 @@@ 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
  #define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
  
  /* misc math functions */
- extern const uint8_t ff_log2_tab[256];
  
 +/**
 + * Reverse the order of the bits of an 8-bits unsigned integer.
 + */
  #if FF_API_AV_REVERSE
  extern attribute_deprecated const uint8_t av_reverse[256];
  #endif
   * @{
   */
  
 +#if   ARCH_ARM
 +#   include "arm/intmath.h"
 +#endif
 +
  #if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4)
  
- #ifndef av_log2
- #   define av_log2(x) (31 - __builtin_clz((x)|1))
- #   ifndef av_log2_16bit
- #      define av_log2_16bit av_log2
+ #ifndef ff_log2
+ #   define ff_log2(x) (31 - __builtin_clz((x)|1))
+ #   ifndef ff_log2_16bit
+ #      define ff_log2_16bit av_log2
  #   endif
- #endif /* av_log2 */
+ #endif /* ff_log2 */
  
  #endif /* AV_GCC_VERSION_AT_LEAST(3,4) */
  
@@@ -1,4 -1,4 +1,4 @@@
  LIBAVUTIL_$MAJOR {
-         global: av*; ff_*;
 -        global: av*; ff_*_tab;
++        global: av*; ff_*; ff_*_tab;
          local: *;
  };
index 0000000,18c1b40..b0c00e1
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,34 +1,34 @@@
 - * This file is part of Libav.
+ /*
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * 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.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * 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 "intmath.h"
+ /* undef these to get the function prototypes from common.h */
+ #undef av_log2
+ #undef av_log2_16bit
+ #include "common.h"
+ int av_log2(unsigned v)
+ {
+     return ff_log2(v);
+ }
+ int av_log2_16bit(unsigned v)
+ {
+     return ff_log2_16bit(v);
+ }