Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 12:26:46 +0000 (14:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 12:26:46 +0000 (14:26 +0200)
* commit '9734b8ba56d05e970c353dfd5baafa43fdb08024':
  Move avutil tables only used in libavcodec to libavcodec.

Conflicts:
libavcodec/mathtables.c
libavutil/intmath.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 files changed:
1  2 
libavcodec/Makefile
libavcodec/arm/mathops.h
libavcodec/mathops.h
libavcodec/mathtables.c
libavcodec/motion_est.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/ra144.c
libavcodec/roqaudioenc.c
libavutil/Makefile
libavutil/arm/intmath.h
libavutil/intmath.h
libavutil/mathematics.c

@@@ -740,16 -653,9 +741,10 @@@ OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF
  OBJS-$(CONFIG_TEXT2MOVSUB_BSF)            += movsub_bsf.o
  
  # thread libraries
 -OBJS-$(HAVE_PTHREADS)                  += pthread.o
 -OBJS-$(HAVE_W32THREADS)                += pthread.o
 +OBJS-$(HAVE_PTHREADS)                  += pthread.o frame_thread_encoder.o
 +OBJS-$(HAVE_W32THREADS)                += pthread.o frame_thread_encoder.o
 +OBJS-$(HAVE_OS2THREADS)                += pthread.o frame_thread_encoder.o
  
- # inverse.o contains the ff_inverse table definition, which is used by
- # the FASTDIV macro (from libavutil); since referencing the external
- # table has a negative effect on performance, copy it in libavcodec as
- # well.
- OBJS-$(!CONFIG_SMALL)                  += inverse.o
  SKIPHEADERS                            += %_tablegen.h                  \
                                            %_tables.h                    \
                                            aac_tablegen_decl.h           \
Simple merge
Simple merge
@@@ -1,10 -1,7 +1,9 @@@
  /*
-  * Inverse table
 - * This file is part of Libav.
 + * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at>
   *
 - * Libav is free software; you can redistribute it and/or
 + * 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.
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
   * @{
   */
  
- extern const uint32_t ff_inverse[257];
 +#if   ARCH_ARM
 +#   include "arm/intmath.h"
- #elif ARCH_X86
- #   include "x86/intmath.h"
 +#endif
 +
  #if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4)
  
  #ifndef av_log2
  #include <stdint.h>
  #include <limits.h>
  #include "mathematics.h"
 +#include "libavutil/common.h"
 +#include "avassert.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
- };
  const uint8_t ff_log2_tab[256]={
          0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
          5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,