Merge commit 'd5c62122a7b26704bf867a1262df358623bf5edf'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Oct 2012 12:35:42 +0000 (14:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Oct 2012 12:35:42 +0000 (14:35 +0200)
* commit 'd5c62122a7b26704bf867a1262df358623bf5edf':
  Move av_reverse table to libavcodec

Conflicts:
libavcodec/asvenc.c
libavcodec/vble.c
libavutil/common.h
libavutil/mathematics.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
16 files changed:
1  2 
libavcodec/asvdec.c
libavcodec/asvenc.c
libavcodec/bitstream.c
libavcodec/indeo2.c
libavcodec/ivi_common.c
libavcodec/mathops.h
libavcodec/mathtables.c
libavcodec/pcm.c
libavcodec/s302m.c
libavcodec/tiff.c
libavcodec/vble.c
libavcodec/wnv1.c
libavcodec/xbmenc.c
libavutil/common.h
libavutil/mathematics.c
libavutil/version.h

  #include "avcodec.h"
  #include "put_bits.h"
  #include "dsputil.h"
+ #include "mathops.h"
  #include "mpeg12data.h"
  
 -//#undef NDEBUG
 -//#include <assert.h>
 -
  #define VLC_BITS 6
  #define ASV2_LEVEL_VLC_BITS 10
  
@@@ -28,7 -28,7 +28,8 @@@
  
  #include "asv.h"
  #include "avcodec.h"
 +#include "internal.h"
+ #include "mathops.h"
  #include "mpeg12data.h"
  
  static inline void asv2_put_bits(PutBitContext *pb, int n, int v){
@@@ -28,8 -28,8 +28,9 @@@
   * bitstream api.
   */
  
 +#include "libavutil/avassert.h"
  #include "avcodec.h"
+ #include "mathops.h"
  #include "get_bits.h"
  #include "put_bits.h"
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  #endif
  #include "lzw.h"
  #include "tiff.h"
 +#include "tiff_data.h"
  #include "faxcompr.h"
- #include "libavutil/common.h"
+ #include "mathops.h"
+ #include "libavutil/attributes.h"
  #include "libavutil/intreadwrite.h"
  #include "libavutil/imgutils.h"
 +#include "libavutil/avstring.h"
  
  typedef struct TiffContext {
      AVCodecContext *avctx;
Simple merge
Simple merge
Simple merge
  /* misc math functions */
  extern const uint8_t ff_log2_tab[256];
  
- extern const uint8_t av_reverse[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
  
  static av_always_inline av_const int av_log2_c(unsigned int v)
  {
   * miscellaneous math routines and tables
   */
  
 -#include <assert.h>
  #include <stdint.h>
  #include <limits.h>
  #include "mathematics.h"
 +#include "libavutil/common.h"
 +#include "avassert.h"
+ #include "version.h"
  
+ #if FF_API_AV_REVERSE
  const uint8_t av_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,
Simple merge