Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Sep 2012 15:41:17 +0000 (17:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Sep 2012 15:41:17 +0000 (17:41 +0200)
* qatar/master:
  build: avcodec: order cosmetics
  intrax8dsp: Add missing #include to make header standalone
  Delete motion-test tool; it is of doubtful utility.

Conflicts:
libavcodec/Makefile
libavcodec/motion-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/Makefile
libavcodec/intrax8dsp.h

@@@ -36,11 -33,10 +36,11 @@@ OBJS = allcodecs.
  # parts needed for many different codecs
  OBJS-$(CONFIG_AANDCTTABLES)            += aandcttab.o
  OBJS-$(CONFIG_AC3DSP)                  += ac3dsp.o
- OBJS-$(CONFIG_ENCODERS)                += faandct.o jfdctfst.o jfdctint.o
 +OBJS-$(CONFIG_CRYSTALHD)               += crystalhd.o
  OBJS-$(CONFIG_DCT)                     += dct.o dct32_fixed.o dct32_float.o
 -OBJS-$(CONFIG_DWT)                     += dwt.o
 +OBJS-$(CONFIG_DWT)                     += dwt.o snow.o
  OBJS-$(CONFIG_DXVA2)                   += dxva2.o
+ OBJS-$(CONFIG_ENCODERS)                += faandct.o jfdctfst.o jfdctint.o
  OBJS-$(CONFIG_ERROR_RESILIENCE)        += error_resilience.o
  FFT-OBJS-$(CONFIG_HARDCODED_TABLES)    += cos_tables.o cos_fixed_tables.o
  OBJS-$(CONFIG_FFT)                     += avfft.o fft_fixed.o fft_float.o \
@@@ -777,10 -691,7 +777,9 @@@ TESTPROGS = caba
              golomb                                                      \
              iirfilter                                                   \
              rangecoder                                                  \
 +            raw                                                         \
 +            snowenc                                                     \
  
- TESTPROGS-$(HAVE_MMX) += motion
  TESTOBJS = dctref.o
  
  HOSTPROGS = aac_tablegen                                                \
Simple merge