Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jan 2013 13:13:54 +0000 (14:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 23 Jan 2013 13:13:54 +0000 (14:13 +0100)
* commit '5959bfaca396ecaf63a8123055f499688b79cae3':
  floatdsp: move butterflies_float from dsputil to avfloatdsp.

Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/imc.c
libavcodec/mpegaudiodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 files changed:
1  2 
libavcodec/aacdec.c
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/dsputil_neon.S
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/imc.c
libavcodec/mpegaudiodec.c
libavcodec/twinvq.c
libavcodec/wma.c
libavcodec/wma.h
libavcodec/wmadec.c
libavutil/float_dsp.c
libavutil/float_dsp.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -36,7 -36,7 +36,8 @@@
  #include <stdio.h>
  
  #include "libavutil/channel_layout.h"
+ #include "libavutil/float_dsp.h"
 +#include "libavutil/libm.h"
  #include "avcodec.h"
  #include "get_bits.h"
  #include "dsputil.h"
   * MPEG Audio decoder
   */
  
 +#include "libavutil/avassert.h"
  #include "libavutil/channel_layout.h"
+ #include "libavutil/float_dsp.h"
 +#include "libavutil/libm.h"
  #include "avcodec.h"
  #include "get_bits.h"
  #include "internal.h"
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge